diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-14 17:02:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-14 17:02:30 -0700 |
| commit | af3d7a6a729f0763ca0f93b5d1ef33d571ef4e8d (patch) | |
| tree | a73b8a45935ae6c307995379bbdd58661731479e /Documentation/git-rebase.txt | |
| parent | Merge branch 'se/rev-parse' into next (diff) | |
| parent | Make git rebase interactive help match documentation. (diff) | |
| download | tgif-af3d7a6a729f0763ca0f93b5d1ef33d571ef4e8d.tar.xz | |
Merge branch 'se/rebase' into next
* se/rebase:
Make git rebase interactive help match documentation.
Diffstat (limited to 'Documentation/git-rebase.txt')
| -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. |