diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-16 03:23:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-16 03:23:57 +0000 |
| commit | f5a9362a72a5a586926fce49c90c93a75cbad2b5 (patch) | |
| tree | d4750ea1466329b97186f9eac8f898611a6fbbad /git-rebase.txt | |
| parent | 38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (diff) | |
| download | git-htmldocs-f5a9362a72a5a586926fce49c90c93a75cbad2b5.tar.gz | |
Autogenerated HTML docs for v1.5.6.3-384-gfcab4
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index e30f6a698..51afc87e1 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -39,7 +39,7 @@ 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 -original <branch> and remove the .dotest working files, use the command +original <branch> and remove the .git/rebase working files, use the command `git rebase --abort` instead. Assume the following history exists and the current branch is "topic": |