On 2008-03-01, John Goerzen <jgoerzen@xxxxxxxxxxxx> wrote: > 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
