diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-05-17 10:34:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-05-17 10:34:11 +0000 |
| commit | 6959c6c419acf390c79b816b7117da3cac54db71 (patch) | |
| tree | c7e975800d0c058b294e619cfda9ae8d61338501 /git-rebase.txt | |
| parent | 617fdb88b05107e6673f6aafb280c1ef27acae7b (diff) | |
| download | git-htmldocs-6959c6c419acf390c79b816b7117da3cac54db71.tar.gz | |
Autogenerated HTML docs for v1.3.3-g63df
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 1b482abec..08ee4aaba 100644 --- a/git-rebase.txt +++ b/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. |