From: Jonathan Nieder <jrnieder@gmail.com>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>,
esr@thyrsus.com, git@vger.kernel.org
Subject: Re: RFC - "git editlog" feature for fixing up local commit messages
Date: Tue, 30 Mar 2010 18:11:14 -0500 [thread overview]
Message-ID: <20100330231114.GA11591@progeny.tock> (raw)
In-Reply-To: <32541b131003301136h4454f02cyd5a94d746e844a8d@mail.gmail.com>
Avery Pennarun wrote:
> On Tue, Mar 30, 2010 at 4:52 AM, Michael J Gruber
>> 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?
preserve-merges is in bad shape. I’d recommend not using it unless you’re
willing to hack on it.
Example issues: interacts poorly with merge.log, reordering commits
produces very confusing results.
Example of why it is not necessarily the tool for all seasons: requires a
diff+apply cycle. If you are tracking large or binary files or amending a
very old commit message, it makes more sense to avoid this overhead. See
http://thread.gmane.org/gmane.comp.version-control.git/143426
for example.
Hope that helps,
Jonathan
next prev parent reply other threads:[~2010-03-30 23:12 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
2010-03-30 23:11 ` Jonathan Nieder [this message]
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=20100330231114.GA11591@progeny.tock \
--to=jrnieder@gmail.com \
--cc=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).