diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-22 09:20:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-22 09:20:44 +0000 |
| commit | 0868a302deebe5253106fdf9af00c82e2c711e66 (patch) | |
| tree | f24a8821760fc2732d75ec72e5527620e5138fa6 /git-rebase.txt | |
| parent | 5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f (diff) | |
| download | git-htmldocs-0868a302deebe5253106fdf9af00c82e2c711e66.tar.gz | |
Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 51afc87e1..59c1b021a 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -39,8 +39,8 @@ 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 .git/rebase working files, use the command -`git rebase --abort` instead. +original <branch> and remove the .git/rebase-apply working files, use the +command `git rebase --abort` instead. Assume the following history exists and the current branch is "topic": @@ -398,7 +398,7 @@ after each commit, test, and amend the commit if fixes are necessary. Authors ------ -Written by Junio C Hamano <junkio@cox.net> and +Written by Junio C Hamano <gitster@pobox.com> and Johannes E. Schindelin <johannes.schindelin@gmx.de> Documentation |