From: Bernt Hansen <bernt@norang.ca>
To: John Wiegley <jwiegley@gmail.com>
Cc: Tassilo Horn <tassilo@member.fsf.org>, emacs-orgmode@gnu.org
Subject: Re: A request: Moving away from ChangeLog
Date: Fri, 21 May 2010 12:01:55 -0400 [thread overview]
Message-ID: <87iq6h2qh8.fsf@gollum.intra.norang.ca> (raw)
In-Reply-To: <EBA86F3E-9B83-435A-9DBA-AE54865147D9@gmail.com> (John Wiegley's message of "Fri\, 21 May 2010 11\:46\:41 -0400")
John Wiegley <jwiegley@gmail.com> 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
next prev parent reply other threads:[~2010-05-21 16:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-21 9:06 A request: Moving away from ChangeLog John Wiegley
2010-05-21 9:41 ` John Wiegley
2010-05-21 12:15 ` Carsten Dominik
2010-05-21 12:50 ` John Wiegley
2010-05-21 13:47 ` Tassilo Horn
2010-05-21 15:06 ` John Wiegley
2010-05-21 15:39 ` Bernt Hansen
2010-05-21 15:46 ` John Wiegley
2010-05-21 16:01 ` Bernt Hansen [this message]
2010-05-21 16:32 ` Eric Schulte
2010-05-21 15:53 ` Carsten Dominik
2010-05-21 15:58 ` John Wiegley
2010-05-21 14:32 ` Carsten Dominik
2010-05-21 15:08 ` John Wiegley
2010-05-21 15:33 ` John Wiegley
2010-05-21 13:01 ` Ben Finney
2010-05-21 14:21 ` Carsten Dominik
2010-05-21 21:10 ` Christian Egli
2010-05-21 21:17 ` Julien Danjou
2010-06-01 14:58 ` Carsten Dominik
2010-06-02 7:44 ` Christian Egli
2010-06-02 9:32 ` Carsten Dominik
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=87iq6h2qh8.fsf@gollum.intra.norang.ca \
--to=bernt@norang.ca \
--cc=emacs-orgmode@gnu.org \
--cc=jwiegley@gmail.com \
--cc=tassilo@member.fsf.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).