{"thread":{"id":"66846","subject":"[PATCH] doc: include fmt-merge-msg config in the main config doc","startedAt":"2026-11-13T14:45:42Z","lastAt":"2026-11-15T10:09:49Z","messageCount":3,"participants":["YikunWei","Junio C Hamano","Yikun Wei"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"558400","messageId":"20261113144543.46713-1-YikunWei@126.com","threadId":"66846","inReplyTo":null,"subject":"[PATCH] doc: include fmt-merge-msg config in the main config doc","fromName":"YikunWei","fromEmail":"yikunwei@126.com","sentAt":"2026-11-13T14:45:42Z","receivedAt":"2026-11-13T14:45:42Z","isPatch":true,"sender":{"key":"yikunwei@126.com","avatar":null},"body":"From: Yikun Wei <YikunWei@126.com>\n\nconfig/fmt-merge-msg.adoc was only included by git-fmt-merge-msg(1),\nso merge.branchdesc, merge.log and merge.suppressDest were missing\nfrom git-config(1), the central configuration reference. Include it\nin config.adoc (alphabetically between filter and format) so that\nthey are listed in `git help config`.\n\nSigned-off-by: Yikun Wei <YikunWei@126.com>\n---\n Documentation/config.adoc | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/Documentation/config.adoc b/Documentation/config.adoc\nindex aa6360e230..06ec247d92 100644\n--- a/Documentation/config.adoc\n+++ b/Documentation/config.adoc\n@@ -498,6 +498,8 @@ include::config/fetch.adoc[]\n \n include::config/filter.adoc[]\n \n+include::config/fmt-merge-msg.adoc[]\n+\n include::config/format.adoc[]\n \n include::config/fsck.adoc[]\n-- \n2.43.0\n\n\n"},{"id":"558482","messageId":"xmqq33t3p53y.fsf@gitster.g","threadId":"66846","inReplyTo":"20261113144543.46713-1-YikunWei@126.com","subject":"Re: [PATCH] doc: include fmt-merge-msg config in the main config doc","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-11-14T19:47:45Z","receivedAt":"2026-11-14T19:47:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"YikunWei <YikunWei@126.com> writes:\n\n> From: Yikun Wei <YikunWei@126.com>\n>\n> config/fmt-merge-msg.adoc was only included by git-fmt-merge-msg(1),\n> so merge.branchdesc, merge.log and merge.suppressDest were missing\n> from git-config(1), the central configuration reference. Include it\n> in config.adoc (alphabetically between filter and format) so that\n> they are listed in `git help config`.\n\nDon't we include merge.adoc which in turn includes this file?\n\n\n"},{"id":"558495","messageId":"d1e75551-2557-4938-9055-9918bdea6190@126.com","threadId":"66846","inReplyTo":"xmqq33t3p53y.fsf@gitster.g","subject":"Re: [PATCH] doc: include fmt-merge-msg config in the main config doc","fromName":"Yikun Wei","fromEmail":"yikunwei@126.com","sentAt":"2026-11-15T10:09:49Z","receivedAt":"2026-11-15T10:09:49Z","isPatch":true,"sender":{"key":"yikunwei@126.com","avatar":null},"body":"You are right. I missed that config/merge.adoc already includes\nconfig/fmt-merge-msg.adoc, and config.adoc already includes\nconfig/merge.adoc, so merge.branchdesc, merge.log and merge.suppressDest\nare already in git-config(1). My patch would duplicate those entries.\n\nSorry for the noise -- please drop this patch. I won't reroll it.\n\nThanks,\nYikun\n\n\n"}]}