From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linh Dang Subject: Re: Git recommendations Date: Mon, 24 Nov 2008 19:44:09 +0000 (UTC) Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4hMu-0005Qj-Uj for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 14:45:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4hMt-0005Q5-CE for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 14:45:12 -0500 Received: from [199.232.76.173] (port=53110 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4hMt-0005Pt-5u for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 14:45:11 -0500 Received: from main.gmane.org ([80.91.229.2]:60262 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L4hMs-0003nf-OE for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 14:45:10 -0500 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1L4hMk-0005NU-F7 for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 19:45:03 +0000 Received: from h213s73a129n47.user.nortelnetworks.com ([47.129.73.213]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 24 Nov 2008 19:45:02 +0000 Received: from linhd by h213s73a129n47.user.nortelnetworks.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 24 Nov 2008 19:45:02 +0000 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Richard Riley 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.