From: Jeff King <peff@peff.net>
Date: Sun, 21 Nov 2010 16:30:02 GMT
Subject: Re: How to fix “Your branch and 'origin/master' have diverged” after editing a commit that came before a pull?
Message-ID: <20101121163001.GA29216@sigill.intra.peff.net>
In-Reply-To: <AANLkTikCnX5aBrmh9+wnb9JyOiynv0zhrpdMJwbhL2ji@mail.gmail.com>

On Sun, Nov 21, 2010 at 10:45:13PM +0800, Gavin Guo wrote:

> > To fix it, what you want to do is recreate the history on top of B' as
> > it happened on top of B. So first you go back to C', the last commit
> > just before the commits from upstream that were rewritten. (you will
> > have pick its sha1 out of the log):
> >
> >  git checkout -b temp B'
> 
> I think you mean git checkout -b temp C'

Yes, sorry. You should base your temp branch on C'.

> >  git rebase --onto temp F'^ branch_name
> [...]
> > At that point your original branch should be in the state you want. You
> > can delete the temp branch with "git branch -D temp".
> 
> I'm sorry that I can't understand "your original branch should be in
> the state you want" ?
> You only create a temp branch, and rebase some commits on it, right ??
> What does that related to original branch ??

The three-argument form of rebase above will switch to branch_name (your
original branch), consider F'^ as the upstream, and rebase
F'^..branch_name on top of the commits in "temp".

-Peff