From: Linh Dang <linhd@nortel.com>
To: emacs-orgmode@gnu.org
Subject: Re: Git recommendations
Date: Mon, 24 Nov 2008 19:44:09 +0000 (UTC) [thread overview]
Message-ID: <loom.20081124T193053-389@post.gmane.org> (raw)
In-Reply-To: nkiqregksu.fsf@development.richardriley.net
Richard Riley <rileyrgdev <at> googlemail.com> writes:
>
>
> I've just spent a short time giving the crash test dummy procedure to a
> few git interfaces for emacs. All have their benefits. A lot have their
> negatives, But my immediate favourite for anyone thinking of using emacs
> interface to git for org is the following:
>
> http://tsgates.cafe24.com/git/git-emacs.html#sec1
>
> It doesn't come with a lot of default key bindings but the two most
> important for those familiar with vc-backend are there:
>
> C-x v v
> and
> C-x v =
egg's file-oriented minor-mode also has those 2 mappings (as well as
other vc main keys such as C-x v u, C-x vl, etc.)
>
> git-diff interfaces nicely to ediff.
if the egg's status buffer, if you type [RET] at a conflicting delta
(after a merge/rebase), egg will launch ediff3 to let you resolve the
conflict.
> magit and egg tend to
> git-status centric as opposed to file centric.
egg is has minor-mode which is fairly file-oriented. egg's "C-x v v"
sequence is customizable to match your personal workflow
> emacs-git is a nice
> mixture. It palms off the log/history interface to gitk - no need to
> reinvent the wheel.
egg uses the log buffer to do branch/tag creation/deletion as well
as pull/push/fetch etc.
http://github.com/bogolisk/egg/wikis
>
> Simple, powerful, extensible. Recommended.
>
> Oh, but missing staging .... which magit and egg support but vc-git,
> git.el and emacs-git do not. I think ...
magit and egg main raison-d'etre was exactly that: hunk-by-hunk
staging/unstaging.
I haven't touch egg for a while and of course I'm biased.
next prev parent reply other threads:[~2008-11-24 19:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-27 14:44 Git recommendations Richard Riley
2008-10-27 17:53 ` Ross Patterson
2008-10-27 18:22 ` Richard Riley
2008-10-27 18:31 ` Ross Patterson
2008-10-27 18:47 ` Richard Riley
2008-10-27 20:51 ` Mykola Nikishov
2008-10-28 18:40 ` Ross Patterson
2008-11-24 19:44 ` Linh Dang [this message]
2008-11-24 21:10 ` Richard Riley
2008-12-01 2:29 ` Samuel Wales
2008-12-01 14:25 ` Alex Ott
2008-12-01 15:56 ` Richard Riley
2008-12-07 22:15 ` Samuel Wales
2008-12-08 12:36 ` Tim O'Callaghan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=loom.20081124T193053-389@post.gmane.org \
--to=linhd@nortel.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).