summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2008-07-08 04:12:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-08 20:13:03 (GMT)
commit9869099bee332e4c351c3aaa15a74786d85909c7 (patch)
tree9e125633e36366e947c6f00dcd42fac8e7b2a9bc /Documentation/git-am.txt
parent22e407951ef2572c1e68a39364fd3c4b649a3495 (diff)
downloadgit-9869099bee332e4c351c3aaa15a74786d85909c7.zip
git-9869099bee332e4c351c3aaa15a74786d85909c7.tar.gz
git-9869099bee332e4c351c3aaa15a74786d85909c7.tar.bz2
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-am.txt')
-rw-r--r--Documentation/git-am.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 3863eeb..88ca5f1 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -145,6 +145,12 @@ directory exists, so if you decide to start over from scratch,
run `rm -f -r .dotest` before running the command with mailbox
names.
+Before any patches are applied, ORIG_HEAD is set to the tip of the
+current branch. This is useful if you have problems with multiple
+commits, like running 'git am' on the wrong branch or an error in the
+commits that is more easily fixed by changing the mailbox (e.g.
+errors in the "From:" lines).
+
SEE ALSO
--------