diff options
| author | Brian Gernhardt <benji@silverinsanity.com> | 2008-07-08 06:12:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-08 22:13:03 +0200 |
| commit | 9869099bee332e4c351c3aaa15a74786d85909c7 (patch) | |
| tree | 9e125633e36366e947c6f00dcd42fac8e7b2a9bc /Documentation/git-rebase.txt | |
| parent | Teach "am" and "rebase" to mark the original position with ORIG_HEAD (diff) | |
| download | git-9869099bee332e4c351c3aaa15a74786d85909c7.tar.xz git-9869099bee332e4c351c3aaa15a74786d85909c7.zip | |
Documentation: mention ORIG_HEAD in am, merge, and rebase
Merge has always set ORIG_HEAD but never mentioned it, while we
recently added it to am and rebase. These facts should be reflected
in the documentation.
git-reset also sets ORIG_HEAD, but that fact is already mentioned in
the very first example so no changes were needed there.
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
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 |