summaryrefslogtreecommitdiffstats
path: root/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 14:48:09 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-22 14:48:09 -0800
commit6df93d9e8038d7ac3d2cb49dfbe125e874b15ba9 (patch)
tree61e19c43f6d3ff81843003c365713c7213fb26f1 /git-am.txt
parent30758bdbd92da4a8a57a943699d50e65f12646a0 (diff)
downloadgit-htmldocs-6df93d9e8038d7ac3d2cb49dfbe125e874b15ba9.tar.gz
Autogenerated HTML docs for v2.2.1-201-gbbceff
Diffstat (limited to 'git-am.txt')
-rw-r--r--git-am.txt12
1 files changed, 11 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt
index 9adce372e..f4eea28dc 100644
--- a/git-am.txt
+++ b/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.
@@ -83,7 +94,6 @@ default. You can use `--no-utf8` to override this.
it is supposed to apply to and we have those blobs
available locally.
---ignore-date::
--ignore-space-change::
--ignore-whitespace::
--whitespace=<option>::