diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:26:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:26:52 (GMT) |
| commit | fa7f51d53385ee64858a415f817d6b8485197405 (patch) | |
| tree | 717d8b54cfd65705a67dcd4511849f6311555d2f /Documentation | |
| parent | a7ddaa8eacb45fdd5241e52d72e6f75d8b67b953 (diff) | |
| parent | a078f7321b02eb945b63804a80b0ba52c9da4ed3 (diff) | |
| download | git-fa7f51d53385ee64858a415f817d6b8485197405.zip git-fa7f51d53385ee64858a415f817d6b8485197405.tar.gz git-fa7f51d53385ee64858a415f817d6b8485197405.tar.bz2 | |
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')
| -rw-r--r-- | Documentation/git-am.txt | 11 | ||||
| -rw-r--r-- | Documentation/git-mailinfo.txt | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 9adce37..cfb74bc 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. diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index 164a3c6..0947084 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -66,6 +66,11 @@ conversion, even with this flag. -n:: Disable all charset re-coding of the metadata. +-m:: +--message-id:: + Copy the Message-ID header at the end of the commit message. This + is useful in order to associate commits with mailing list discussions. + --scissors:: Remove everything in body before a scissors line. A line that mainly consists of scissors (either ">8" or "8<") and perforation |