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 -- 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