git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: RFC - "git editlog" feature for fixing up local commit messages

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Mar 30, 2010, 23:11 UTC
Message-ID
<20100330231114.GA11591@progeny.tock>
In-Reply-To
<32541b131003301136h4454f02cyd5a94d746e844a8d@mail.gmail.com>
Avery Pennarun wrote:
> On Tue, Mar 30, 2010 at 4:52 AM, Michael J Gruber
Show 7 quoted lines
>> 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

Previous: Avery PennarunNext: Miles Bader
Message 7 of 8 in “RFC - "git editlog" feature for fixing up local commit messages”
  1. Eric RaymondMar 29, 2010
  2. Sverre RabbelierMar 29, 2010
  3. Nicolas PitreMar 29, 2010
  4. Avery PennarunMar 29, 2010
  5. Michael J GruberMar 30, 2010
  6. Avery PennarunMar 30, 2010
  7. Jonathan NiederMar 30, 2010
  8. Miles BaderMar 30, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.