X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=59c1b021a6c410e1097df21d6d47365aec6689e2;hb=0fe8c1381043ef64fce1b8372df19046a4b1518e;hp=51afc87e173ca135e4a663ce58b8378c1aef1d25;hpb=c158cae110c917372efe9ff2f080ea0357b05879;p=git.git diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 51afc87e1..59c1b021a 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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 and remove the .git/rebase working files, use the command -`git rebase --abort` instead. +original 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 and +Written by Junio C Hamano and Johannes E. Schindelin Documentation