From 9869099bee332e4c351c3aaa15a74786d85909c7 Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Tue, 8 Jul 2008 00:12:22 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-merge.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Documentation/git-merge.txt') diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 62f99b5f3b..019e4ca8f5 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -81,7 +81,9 @@ Otherwise, merge will refuse to do any harm to your repository (that is, it may fetch the objects from remote, and it may even update the local branch used to keep track of the remote branch with `git pull remote rbranch:lbranch`, but your working tree, -`.git/HEAD` pointer and index file are left intact). +`.git/HEAD` pointer and index file are left intact). In addition, +merge always sets `.git/ORIG_HEAD` to the original state of HEAD so +a problematic merge can be removed by using `git reset ORIG_HEAD`. You may have local modifications in the working tree files. In other words, 'git-diff' is allowed to report changes. -- cgit v1.2.1