diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-07-23 00:51:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-07-23 00:51:59 +0000 |
| commit | 15567bc0c61c951197cb392b835678729534de57 (patch) | |
| tree | 8be698fd27be92da0c23a77720987071e73b1d69 /git-rebase.txt | |
| parent | 708376e8576f6d39b62b27ee9dfe7292c652f728 (diff) | |
| download | git-htmldocs-15567bc0c61c951197cb392b835678729534de57.tar.gz | |
Autogenerated HTML docs for v1.7.6-345-g5c2f8
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 9a075bc4d..504945c69 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -12,7 +12,6 @@ SYNOPSIS [<upstream>] [<branch>] 'git rebase' [-i | --interactive] [options] --onto <newbase> --root [<branch>] - 'git rebase' --continue | --skip | --abort DESCRIPTION @@ -46,7 +45,7 @@ with a different commit message or timestamp will be skipped). 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`. Another option is to bypass the commit -that caused the merge failure with `git rebase --skip`. To restore the +that caused the merge failure with `git rebase --skip`. To check out the original <branch> and remove the .git/rebase-apply working files, use the command `git rebase --abort` instead. @@ -233,7 +232,11 @@ leave out at most one of A and B, in which case it defaults to HEAD. Restart the rebasing process after having resolved a merge conflict. --abort:: - Restore the original branch and abort the rebase operation. + Abort the rebase operation and reset HEAD to the original + branch. If <branch> was provided when the rebase operation was + started, then HEAD will be reset to <branch>. Otherwise HEAD + will be reset to where it was when the rebase operation was + started. --skip:: Restart the rebasing process by skipping the current patch. |