@matheusbsbs / matheus-bagliano / commits / 444e423f81

doc: am: revert Message-ID trailer claim

I claimed in 3c18135b (doc: am: say that --message-id adds a trailer, 2026-02-09) that `git am --message-id` adds a Git trailer. But that isn’t the case; for the case of a commit message with a subject, body, and no trailer block: <subject> <paragrah> It just appends the line right after `paragraph`: <subject> <paragraph> Message-ID: <message-id_trailer.323@msgid.xyz> It does work for two other cases though, namely subject-only and with an existing trailer block. This is at best an inconsistency and arguably a bug, but we’re at the trailing end of the release cycle now. So reverting the doc is safer than making msg-id act as a trailer, for now. Revert this hunk from commit 3c18135b except the only useful change (“Also use inline-verbatim for `Message-ID`”). Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Kristoffer Haugsbakk committed Apr 11, 2026 at 22:15 UTC 444e423f81087e71d396ba11c6734e66a40206cb

1 file changed +4 -5

Documentation/git-am.adoc

+4 -5

@@ -84,11 +84,10 @@ OPTIONS

85 -m::

86 --message-id::

87 - Pass the `-m` flag to linkgit:git-mailinfo[1], so that the

88 - `Message-ID` header is added as a trailer (see

89 - linkgit:git-interpret-trailers[1]). The `am.messageid`

90 - configuration variable can be used to specify the default

91 - behaviour.

87 + Pass the `-m` flag to linkgit:git-mailinfo[1],

88 + so that the `Message-ID` header is added to the commit message.

89 + The `am.messageid` configuration variable can be used to specify

90 + the default behaviour.

92 --no-message-id::

93 Do not add the Message-ID header to the commit message.