summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-14 23:45:49 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-14 23:45:49 -0700
commit633ce9a3ba973acf19a122e1359b7ae724887d70 (patch)
treed360db37cc2c4f64ed85eae77e03f2b98061c9b1 /Documentation/git-rebase.txt
parent055767194c15f9b7c39a509daf1a77472c77bed8 (diff)
parent9869099bee332e4c351c3aaa15a74786d85909c7 (diff)
downloadgit-633ce9a3ba973acf19a122e1359b7ae724887d70.tar.gz
Merge branch 'jc/rebase-orig-head'
* jc/rebase-orig-head: Documentation: mention ORIG_HEAD in am, merge, and rebase Teach "am" and "rebase" to mark the original position with ORIG_HEAD
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index f3459c7de7..e30f6a6982 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -26,7 +26,8 @@ of commits that would be shown by `git log <upstream>..HEAD`.
The current branch is reset to <upstream>, or <newbase> if the
--onto option was supplied. This has the exact same effect as
-`git reset --hard <upstream>` (or <newbase>).
+`git reset --hard <upstream>` (or <newbase>). 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