From: Avery Pennarun <apenwarr@gmail.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: esr@thyrsus.com, git@vger.kernel.org
Subject: Re: RFC - "git editlog" feature for fixing up local commit messages
Date: Tue, 30 Mar 2010 14:36:27 -0400 [thread overview]
Message-ID: <32541b131003301136h4454f02cyd5a94d746e844a8d@mail.gmail.com> (raw)
In-Reply-To: <4BB1BBDA.2050102@drmicha.warpmail.net>
On Tue, Mar 30, 2010 at 4:52 AM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Avery Pennarun venit, vidit, dixit 29.03.2010 22:14:
>> A further option would be to extend git-rebase--interactive.sh (yes,
>> it's just a shell script) to take an option that makes a given commit
>> (or commits) 'reword' by default instead of 'pick'. And maybe another
>> option to make git-rebase--interactive.sh not actually pop up an
>> editor before it starts running. Then your editcommit script could
>> just be a thin wrapper around rebase with those options.
>
> I think the OP's point was that filter-branch is better at keeping
> merges in place; I'm not sure if this is true when rebase-i is used with
> reword only.
I've never actually tried the "--preserve-merges" option to git rebase
-i, but the description sounds as if it's supposed to not have this
problem. Can anyone confirm/deny?
Thanks,
Avery
next prev parent reply other threads:[~2010-03-30 18:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-29 13:31 RFC - "git editlog" feature for fixing up local commit messages Eric Raymond
2010-03-29 13:41 ` Sverre Rabbelier
2010-03-29 15:08 ` Nicolas Pitre
2010-03-29 20:14 ` Avery Pennarun
2010-03-30 8:52 ` Michael J Gruber
2010-03-30 18:36 ` Avery Pennarun [this message]
2010-03-30 23:11 ` Jonathan Nieder
2010-03-30 5:46 ` Miles Bader
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=32541b131003301136h4454f02cyd5a94d746e844a8d@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=esr@thyrsus.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.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.
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 NNTP newsgroup(s).