summaryrefslogtreecommitdiffstats
path: root/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-15 15:49:03 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-15 15:49:03 +0000
commit38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (patch)
treebc44e0dbf17d91c4eec1fdc57bafcec5a15f74dc /git-am.txt
parentc4b18dd00515b271e8b4e4725ce0d19c4ca41636 (diff)
downloadgit-htmldocs-38ddcce0c19a8eedec7a98bd291f65b2127a82b9.tar.gz
Autogenerated HTML docs for v1.5.6.3-350-g6c11a
Diffstat (limited to 'git-am.txt')
-rw-r--r--git-am.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-am.txt b/git-am.txt
index eeb23b25b..1395c7d98 100644
--- a/git-am.txt
+++ b/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
--------