* [PATCH] doc: include fmt-merge-msg config in the main config doc
@ 2026-11-13 14:45 YikunWei
2026-11-14 19:47 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: YikunWei @ 2026-11-13 14:45 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, brian m . carlson, Eric Sunshine, Bruno Haible,
Yikun Wei
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(+)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] doc: include fmt-merge-msg config in the main config doc
2026-11-13 14:45 [PATCH] doc: include fmt-merge-msg config in the main config doc YikunWei
@ 2026-11-14 19:47 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2026-11-14 19:47 UTC (permalink / raw)
To: YikunWei; +Cc: git, brian m . carlson, Eric Sunshine, Bruno Haible
YikunWei <YikunWei@126.com> writes:
> 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?
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-14 19:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-13 14:45 [PATCH] doc: include fmt-merge-msg config in the main config doc YikunWei
2026-11-14 19:47 ` Junio C Hamano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.