X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=59c1b021a6c410e1097df21d6d47365aec6689e2;hb=0fe8c1381043ef64fce1b8372df19046a4b1518e;hp=f3459c7de7c9629f2abfdb684a359bb264ea82ed;hpb=2c95fcf4f92c5d350852ef14aa5140bbe41005b3;p=git.git diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f3459c7de..59c1b021a 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -26,7 +26,8 @@ of commits that would be shown by `git log ..HEAD`. The current branch is reset to , or if the --onto option was supplied. This has the exact same effect as -`git reset --hard ` (or ). +`git reset --hard ` (or ). ORIG_HEAD is set +to point at the tip of the branch before the reset. The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that @@ -38,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 .dotest 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": @@ -397,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