From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 02 Feb 2008 15:42:06 GMT
Subject: Re: Strange behavior with git rebase (-i)
Message-ID: <alpine.LSU.1.00.0802021538300.7372@racer.site>
In-Reply-To: <47A44974.7050907@samba.org>

Hi,

On Sat, 2 Feb 2008, Stefan (metze) Metzmacher wrote:

> [started git rebase -i]
> git commit --amend (again)
> git branch
>  * v4-0-test
> git log
>  (this showed what I wanted)
> git show -p --stat
>  (to really make sure that the top revision is the one I want)
> git push origin v4-0-test
>  And this pushed the top revision BEFORE the rebase!!!
>  Because I forgot a 'git rebase --continue' to finalize the rebase.

I don't believe it.  "git branch" would have shown "* (no branch)" as 
current branch, unless the rebase is finalized.

git rebase -i works on a _detached_ HEAD, for two reasons:

- easier working with reflogs (as the branch's reflog shows before rebase 
and after rebase, but nothing in between), and

- to prevent exactly the scenario you are describing.

Ciao,
Dscho