From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: Re: A request: Moving away from ChangeLog Date: Fri, 21 May 2010 12:01:55 -0400 Message-ID: <87iq6h2qh8.fsf@gollum.intra.norang.ca> References: <2151275B-C80E-4B40-9022-8C9054020163@gmail.com> <469766F9-7C25-4792-A203-B241C22E2ED5@gmail.com> <94D31A4E-B262-4E06-AE2A-9C3D43145CAC@gmail.com> <7D47FD95-8C8D-4540-864A-D2C76B998A52@gmail.com> <87wruxicy4.fsf@thinkpad.tsdh.de> <32B3D851-51FA-43FA-8B14-594597FB42A1@gmail.com> <87tyq12ri9.fsf@gollum.intra.norang.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from [140.186.70.92] (port=47579 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFUfi-0007sC-MO for emacs-orgmode@gnu.org; Fri, 21 May 2010 12:02:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFUfg-0008LV-Fr for emacs-orgmode@gnu.org; Fri, 21 May 2010 12:02:02 -0400 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:59416) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFUfg-0008LP-EB for emacs-orgmode@gnu.org; Fri, 21 May 2010 12:02:00 -0400 In-Reply-To: (John Wiegley's message of "Fri\, 21 May 2010 11\:46\:41 -0400") 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: John Wiegley Cc: Tassilo Horn , emacs-orgmode@gnu.org John Wiegley writes: > On May 21, 2010, at 11:39 AM, Bernt Hansen wrote: > >> I make most of my git commits (including org-mode) in vim which is >> kicked off from raw command-line git. I normally make multiple changes >> at once and then build separate commits by using git's editing hunk >> features from 'git add -p'. I don't think that functionality is >> available in magit yet. > > magit's original purpose was the ability to do just this. So, it's > been able to stage individual hunks since day one. You can also use - > and + to narrow or expand the range of each hunk. Yes but... I can't edit those hunks and take this part but not that part. At least there was one case where 2 changes were on the same line and I wanted to stage only the first edit for commit 1 and then stage the second edit for commit 2. I couldn't find a way to do this in magit. If changes are isolated to single lines it works fine. Now I have to figure out how to specify emacsclient for my editor during rebase in magit -- right now it fails to open the editor due to a wrong path and bails. Bernt