summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-11-25 15:00:56 +0100
committerJunio C Hamano <gitster@pobox.com>2014-11-25 15:27:01 -0800
commita078f7321b02eb945b63804a80b0ba52c9da4ed3 (patch)
tree85c9fd21df647a326c93d847f69c6475b48ffe91 /Documentation/git-am.txt
parent452dfbed1a80754bfdc52567d9d9dba08a7d0a6d (diff)
downloadgit-a078f7321b02eb945b63804a80b0ba52c9da4ed3.tar.gz
git-am: add --message-id/--no-message-idpb/am-message-id-footer
Parse the option and pass it directly to git-mailinfo. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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.