Merge branch 'kh/doc-am-xref' into next

Doc update.

* kh/doc-am-xref:
  doc: am: correct to full --no-message-id
  doc: am: revert Message-ID trailer claim
next
Junio C Hamano 2026-04-13 08:45:03 -07:00
commit 400039b45c
1 changed files with 5 additions and 6 deletions

View File

@ -84,15 +84,14 @@ OPTIONS

-m::
--message-id::
Pass the `-m` flag to linkgit:git-mailinfo[1], so that the
`Message-ID` header is added as a trailer (see
linkgit:git-interpret-trailers[1]). The `am.messageid`
configuration variable can be used to specify the default
behaviour.
Pass the `-m` flag to 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`.
`--no-message-id` is useful to override `am.messageid`.

-q::
--quiet::