From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Riley Subject: Re: Re: Git recommendations Date: Mon, 24 Nov 2008 22:10:37 +0100 Message-ID: <492b1878.0baa660a.1558.ffff81e4@mx.google.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4iiO-0007Pl-5n for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 16:11:28 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4iiM-0007Ms-FI for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 16:11:27 -0500 Received: from [199.232.76.173] (port=41955 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4iiM-0007Me-6t for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 16:11:26 -0500 Received: from rn-out-0910.google.com ([64.233.170.186]:22451) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L4iiL-00023K-SR for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 16:11:26 -0500 Received: by rn-out-0910.google.com with SMTP id k32so1965969rnd.7 for ; Mon, 24 Nov 2008 13:11:21 -0800 (PST) In-Reply-To: (Linh Dang's message of "Mon, 24 Nov 2008 19:44:09 +0000 (UTC)") 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: Linh Dang Cc: emacs-orgmode@gnu.org Linh Dang writes: > 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. Since then I discovered DVC. http://richardriley.net/default/projects/emacs/dvc/tutorial/index It's a shame so much effort is going into so many disjoint projects in my view. They all cover different subsets and none appear to have a large enough following to ensure interest and hence maintenance. Time will tell.