{"thread":{"id":"65711","subject":"[PATCH] doc: add missing --message long option to merge docs","startedAt":"2026-05-29T01:55:29Z","lastAt":"2026-05-31T06:38:07Z","messageCount":3,"participants":["Brandon Dong via GitGitGadget","Junio C Hamano","Brandon"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"544250","messageId":"pull.2315.git.git.1780019726297.gitgitgadget@gmail.com","threadId":"65711","inReplyTo":null,"subject":"[PATCH] doc: add missing --message long option to merge docs","fromName":"Brandon Dong via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2026-05-29T01:55:26Z","receivedAt":"2026-05-29T01:55:29Z","isPatch":true,"body":"From: Brandon \n\nInclude mention of --message flag in merge docs to match what is\naccepted (builtin/merge.c) and to make it consistent with the git\ncommit docs.\n\nSigned-off-by: Brandon Dong \n---\n doc: add missing --message long option to merge docs\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2315%2Fbrandondong%2Fmerge_message_docs-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2315/brandondong/merge_message_docs-v1\nPull-Request: https://github.com/git/git/pull/2315\n\n Documentation/git-merge.adoc | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc\nindex a055384ad6..6581f4c69c 100644\n--- a/Documentation/git-merge.adoc\n+++ b/Documentation/git-merge.adoc\n@@ -68,6 +68,7 @@ OPTIONS\n include::merge-options.adoc[]\n \n `-m `::\n+`--message=`::\n \tSet the commit message to be used for the merge commit (in\n \tcase one is created).\n +\n\nbase-commit: c69baaf57ba26cf117c2b6793802877f19738b0d\n-- \ngitgitgadget\n"},{"id":"544252","messageId":"xmqqo6hyiz9g.fsf@gitster.g","threadId":"65711","inReplyTo":"pull.2315.git.git.1780019726297.gitgitgadget@gmail.com","subject":"Re: [PATCH] doc: add missing --message long option to merge docs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-05-29T05:02:51Z","receivedAt":"2026-05-29T05:02:54Z","isPatch":true,"body":"\"Brandon Dong via GitGitGadget\" writes:\n\n> From: Brandon \n\nAs you identify yourself as \"Brandon Dong\" on the Signed-off-by line\nbelow, please match this in-body From: line with it.\n\n> Include mention of --message flag in merge docs to match what is\n> accepted (builtin/merge.c) and to make it consistent with the git\n> commit docs.\n>\n> Signed-off-by: Brandon Dong \n> ---\n> doc: add missing --message long option to merge docs\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2315%2Fbrandondong%2Fmerge_message_docs-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2315/brandondong/merge_message_docs-v1\n> Pull-Request: https://github.com/git/git/pull/2315\n>\n> Documentation/git-merge.adoc | 1 +\n> 1 file changed, 1 insertion(+)\n>\n> diff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc\n> index a055384ad6..6581f4c69c 100644\n> --- a/Documentation/git-merge.adoc\n> +++ b/Documentation/git-merge.adoc\n> @@ -68,6 +68,7 @@ OPTIONS\n> include::merge-options.adoc[]\n> \n> `-m `::\n> +`--message=`::\n> \tSet the commit message to be used for the merge commit (in\n> \tcase one is created).\n> +\n\nHmph. This is still not consistent with \"git merge -h\" output has,\nwhich seems to accept --[no-]message as well.\n\nIt is not exactly your fault, but there are a few options other than\nthis one that support optional [no-] and they are not documented as\nsuch, even though they appear in \"git merge -h\". \"git merge -m foo\n--no-message other\" behaves as if \"GIT_EDITOR=: git merge other\" was\nrun, it seems.\n"},{"id":"544314","messageId":"CABe-Dmb3-AeT+utpstLWJRGrrEcbXSDYDqnWgMHOwAv85-7eDg@mail.gmail.com","threadId":"65711","inReplyTo":"xmqqo6hyiz9g.fsf@gitster.g","subject":"Re: [PATCH] doc: add missing --message long option to merge docs","fromName":"Brandon","fromEmail":"brandondong96@gmail.com","sentAt":"2026-05-31T06:37:53Z","receivedAt":"2026-05-31T06:38:07Z","isPatch":true,"body":"Junio C Hamano writes:\n\n> Hmph. This is still not consistent with \"git merge -h\" output has,\n> which seems to accept --[no-]message as well.\n>\n> It is not exactly your fault, but there are a few options other than\n> this one that support optional [no-] and they are not documented as\n> such, even though they appear in \"git merge -h\". \"git merge -m foo\n> --no-message other\" behaves as if \"GIT_EDITOR=: git merge other\" was\n> run, it seems.\n\nLooking at the code, I believe this might be intentional or maybe a\nstylistic choice to document this way?\n\nThe overwhelming majority of long name flags have a [no-] variant as\nit comes for free when defining a new option and otherwise requires\nan explicit opt out (via PARSE_OPT_NONEG).\n\nThe -h output auto-generates the inclusion of [no-] but for the\nhandwritten docs, most examples I see where it's included are for\ncases where the [no-] variant has some behavior nuance that needs to\nbe explained or it's for a bool-like flag. Most string-valued options\ndo not include mention of the [no-] variant and they share the\ndefault behavior where passing the [no-] variant unsets the option.\n\nFor -m/--message in particular, none of the\ngit-commit/git-notes/git-svn/git-tag docs mention the --no variant\neither and I think merge should be consistent with them.\n"}]}