diff options
| author |  Sean <seanlkml@sympatico.ca> | 2006-05-13 23:34:08 -0400 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-05-14 16:28:32 -0700 |
| commit | cc120056a881101326488e3c5c2d3af2ce3a8de6 (patch) | |
| tree | f2db202130db038b507aa8c6fa378c4977f3f3b1 /Documentation | |
| parent | Merge branch 'fix' (diff) | |
| download | tgif-cc120056a881101326488e3c5c2d3af2ce3a8de6.tar.xz | |
Make git rebase interactive help match documentation.
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 1b482abecd..08ee4aabaf 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -9,9 +9,7 @@ SYNOPSIS -------- 'git-rebase' [--onto <newbase>] <upstream> [<branch>] -'git-rebase' --continue - -'git-rebase' --abort +'git-rebase' --continue | --skip | --abort DESCRIPTION ----------- @@ -23,9 +21,10 @@ not exist in the <upstream> branch. It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure -and run `git rebase --continue`. If you can not resolve the merge -failure, running `git rebase --abort` will restore the original <branch> -and remove the working files found in the .dotest directory. +and run `git rebase --continue`. Another option is to bypass the commit +that caused the merge failure with `git rebase --skip`. To restore the +original <branch> and remove the .dotest working files, use the command +`git rebase --abort` instead. Note that if <branch> is not specified on the command line, the currently checked out branch is used. |