threads / patch / 66846

patchdoc: include fmt-merge-msg config in the main config doc

Subject: [PATCH] doc: include fmt-merge-msg config in the main config doc

## tl;dr

A patch claims merge.log and related variables are missing from the main config reference; Junio Hamano says merge.adoc may already include them. Read the story.

replies: 2people: 2as markdown or json

YikunWei· Nov 13, 2026, 14:45 UTC · lore
From: Yikun Wei <YikunWei@126.com>

config/fmt-merge-msg.adoc was only included by git-fmt-merge-msg(1), so merge.branchdesc, merge.log and merge.suppressDest were missing from git-config(1), the central configuration reference. Include it in config.adoc (alphabetically between filter and format) so that they are listed in `git help config`.

Signed-off-by: Yikun Wei <YikunWei@126.com>
---
 Documentation/config.adoc | 2 ++
 1 file changed, 2 insertions(+)
Show changes to Documentation/config.adoc +2 −0
diff --git a/Documentation/config.adoc b/Documentation/config.adoc
index aa6360e230..06ec247d92 100644
--- a/Documentation/config.adoc
+++ b/Documentation/config.adoc
@@ -498,6 +498,8 @@ include::config/fetch.adoc[]
 
 include::config/filter.adoc[]
 
+include::config/fmt-merge-msg.adoc[]
+
 include::config/format.adoc[]
 
 include::config/fsck.adoc[]
-- 
2.43.0
Junio C Hamano· Nov 14, 2026, 19:47 UTC · re: YikunWei · lore

Re: [PATCH] doc: include fmt-merge-msg config in the main config doc

YikunWei <YikunWei@126.com> writes:
Show 7 quoted lines
> From: Yikun Wei <YikunWei@126.com>
>
> config/fmt-merge-msg.adoc was only included by git-fmt-merge-msg(1),
> so merge.branchdesc, merge.log and merge.suppressDest were missing
> from git-config(1), the central configuration reference. Include it
> in config.adoc (alphabetically between filter and format) so that
> they are listed in `git help config`.
Don't we include merge.adoc which in turn includes this file?
Yikun Wei· Nov 15, 2026, 10:09 UTC · re: Junio C Hamano · lore

Re: [PATCH] doc: include fmt-merge-msg config in the main config doc

You are right. I missed that config/merge.adoc already includes config/fmt-merge-msg.adoc, and config.adoc already includes config/merge.adoc, so merge.branchdesc, merge.log and merge.suppressDest are already in git-config(1). My patch would duplicate those entries.

Sorry for the noise -- please drop this patch. I won't reroll it.

Thanks, Yikun

← back to recent threads