Re: Need some help with git rebase

From: Tay Ray Chuan <rctay89@gmail.com>
Date: Dec 31, 2009, 05:01 UTC
Message-ID: <be6fef0d0912302101ta010dfamab05b751a0ceee76@mail.gmail.com>
In-Reply-To: <1262211866.7068.1.camel@kheops>

Hi,

On Thu, Dec 31, 2009 at 6:24 AM, Sylvain Rabot <sylvain@abstraction.fr> wrote:

Show 10 quoted lines

> And then, at the end of the rebase, without me doing anything, feature
> branch is checked out and it seems that its HEAD has been reset to the
> new 12.72.1 HEAD.
>
> --x--x--x--x--x--x--x--x--x--x--x--x master
>   \
>    o--o--o--o--o--o--o--a--a--a--a--a--a--a--a--a 12.72.1 feature
>
> Is that normal ? If it is, how do I do to avoid my feature branch to be
> reset at 12.72.1's HEAD ?

reading the manual, I think this is normal.

According to the third paragraph of the description of git-rebase, the branch feature will be reset to 12.72.1.

You can just rename the branch back to 12.72.1, and retrieve the old tip of feature by examining the reflog.

-- 
Cheers,
Ray Chuan