summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:26:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:26:52 -0800
commitfa7f51d53385ee64858a415f817d6b8485197405 (patch)
tree717d8b54cfd65705a67dcd4511849f6311555d2f /Documentation/git-am.txt
parentMerge branch 'mh/simplify-repack-without-refs' (diff)
parentgit-am: add --message-id/--no-message-id (diff)
downloadtgif-fa7f51d53385ee64858a415f817d6b8485197405.tar.xz
Merge branch 'pb/am-message-id-footer'
"git am" learned "--message-id" option to copy the message ID of the incoming e-mail to the log message of resulting commit. * pb/am-message-id-footer: git-am: add --message-id/--no-message-id git-mailinfo: add --message-id
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 9adce372ec..cfb74bcf0b 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -57,6 +57,17 @@ OPTIONS
--no-scissors::
Ignore scissors lines (see linkgit:git-mailinfo[1]).
+-m::
+--message-id::
+ Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),
+ so that the Message-ID header is added to the commit message.
+ The `am.messageid` configuration variable can be used to specify
+ the default behaviour.
+
+--no-message-id::
+ Do not add the Message-ID header to the commit message.
+ `no-message-id` is useful to override `am.messageid`.
+
-q::
--quiet::
Be quiet. Only print error messages.