sean wrote: > git rebase [--branch <branch>] <newbase> > git rebase --continue > git rebase --abort > > Add "--continue" to restart the rebase process after > manually resolving conflicts. The user is warned if > there are still differences between the index and the > working files. > > Add "--abort" to restore the original branch, and > remove the .dotest working files. Very nice. > SYNOPSIS > -------- > -'git-rebase' [--onto <newbase>] <upstream> [<branch>] > +'git-rebase' [--branch <branch>] <newbase> > + > +'git-rebase' --continue > + > +'git-rebase' --abort > > DESCRIPTION > ----------- > -git-rebase applies to <upstream> (or optionally to <newbase>) commits > -from <branch> that do not appear in <upstream>. When <branch> is not > -specified it defaults to the current branch (HEAD). > +git-rebase replaces <branch> with a new branch of the same name having > +a HEAD of <newbase>. It then attempts to make a new commit for each > +commit from the original <branch> that does not yet exist in this new > +<branch>. What about 'git-rebase --onto <newbase> <upstream> <branch>' three options version? -- Jakub Narebski Warsaw, Poland - : 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