From: YikunWei <YikunWei@126.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>,
Eric Sunshine <sunshine@sunshineco.com>,
Bruno Haible <bruno@clisp.org>, Yikun Wei <YikunWei@126.com>
Subject: [PATCH] doc: include fmt-merge-msg config in the main config doc
Date: Fri, 13 Nov 2026 22:45:42 +0800 [thread overview]
Message-ID: <20261113144543.46713-1-YikunWei@126.com> (raw)
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
next reply other threads:[~2026-11-13 14:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-13 14:45 YikunWei [this message]
2026-11-14 19:47 ` [PATCH] doc: include fmt-merge-msg config in the main config doc Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261113144543.46713-1-YikunWei@126.com \
--to=yikunwei@126.com \
--cc=bruno@clisp.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox