Add --continue and --abort options to git-rebase.
commit031321c654de3c19de45b2dacbdc990b5a694e34
authorsean <seanlkml@sympatico.ca>
Wed, 26 Apr 2006 14:49:38 +0000 (26 10:49 -0400)
committerJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 00:10:33 +0000 (26 17:10 -0700)
tree8a53d2274d2507af230edc6e635f9ed076d69493
parent69bcc43eca0f251617e3b5db5df632b24db94e92
Add --continue and --abort options to git-rebase.

  git rebase [--onto <newbase>] <upstream> [<branch>]
  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.

Some minor additions to the git-rebase documentation.

[jc: fix that applies to the maintenance track has been dealt
 with separately.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-rebase.txt
git-rebase.sh