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

Re: git-rebase dirty index and email address bug?

From
JGJohn Goerzen <jgoerzen@complete.org>
Date
Mar 2, 2008, 13:44 UTC
Message-ID
<200803020744.36591.jgoerzen@complete.org>
In-Reply-To
<20080302073016.GC3935@coredump.intra.peff.net>
On Sunday 02 March 2008 1:30:16 am Jeff King wrote:
Show 14 quoted lines
> On Sat, Mar 01, 2008 at 03:29:37PM -0600, John Goerzen wrote:
> > Two things to add:
> >
> > 1) This was a clean branch prior to rebase (git status was empty)
> >
> > 2) Adding -i to the rebase command, then making no changes to the
> > list, caused the rebase to work perfectly.
>
> Yes, "rebase -i" works somewhat differently than an ordinary rebase. It
> uses a series of cherry-picks rather than "format-patch | am". And the
> bug is, I think, in "git-am".
>
> It probably would also have worked using "git rebase -m" which uses
> merge strategies to rebase.

I did try that. The resulting error message was slightly different, but not significantly so, if I remember correctly.

-- John
Previous: Jeff KingNext: Jeff King
Message 4 of 8 in “git-rebase dirty index and email address bug?”
  1. John GoerzenMar 1, 2008
  2. John GoerzenMar 1, 2008
  3. Jeff KingMar 2, 2008
  4. John GoerzenMar 2, 2008
  5. Jeff KingMar 2, 2008
  6. John GoerzenMar 3, 2008
  7. Jeff KingMar 4, 2008
  8. John GoerzenMar 4, 2008

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.