diff options
| author |  sean <seanlkml@sympatico.ca> | 2006-04-26 10:49:38 -0400 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-04-26 17:10:33 -0700 |
| commit | 031321c654de3c19de45b2dacbdc990b5a694e34 (patch) | |
| tree | 8a53d2274d2507af230edc6e635f9ed076d69493 /t/t4100/t-apply-7.expect | |
| parent | Merge branch 'fix' (diff) | |
| download | tgif-031321c654de3c19de45b2dacbdc990b5a694e34.tar.xz | |
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>
Diffstat (limited to 't/t4100/t-apply-7.expect')
0 files changed, 0 insertions, 0 deletions