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 1, 2008, 21:29 UTC
Message-ID
<slrnfsjim1.5e0.jgoerzen@katherina.lan.complete.org>
In-Reply-To
<slrnfsjfpo.3fl.jgoerzen@katherina.lan.complete.org>
On 2008-03-01, John Goerzen <jgoerzen@complete.org> wrote:
Show 7 quoted lines
> Hi folks,
>
> I have checked out a remote git repo.  I have hacked on my local copy
> for the last two days.  I have performed no merges or anything elese
> odd.  Today I git fetched the remote, and then I tried to git rebase
> upstream/master.  I had committed all outstanding changes first.  My
> index was clean.  It displayed:
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.
Previous: John GoerzenNext: Jeff King
Message 2 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.