All of lore.kernel.org
 help / color / mirror / Atom feed
From: "i.Dark_Templar" <darktemplar@dark-templar-archives.net>
To: git@vger.kernel.org
Cc: "i.Dark_Templar" <darktemplar@dark-templar-archives.net>
Subject: [RFC PATCH 3/3] Enable merge commit message type autoselect logic by default
Date: Sun,  9 Feb 2020 16:16:23 +0300	[thread overview]
Message-ID: <20200209131623.5827-4-darktemplar@dark-templar-archives.net> (raw)
In-Reply-To: <20200209131623.5827-1-darktemplar@dark-templar-archives.net>

Signed-off-by: i.Dark_Templar <darktemplar@dark-templar-archives.net>
---
 Documentation/config/fmt-merge-msg.txt | 2 +-
 builtin/fmt-merge-msg.c                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt
index 3829095222..acd998cca8 100644
--- a/Documentation/config/fmt-merge-msg.txt
+++ b/Documentation/config/fmt-merge-msg.txt
@@ -10,7 +10,7 @@ merge.log::
 	true is a synonym for 20.
 
 merge.messageType::
-	Configure default merge commit message type. `original` is used
+	Configure default merge commit message type. `autoselect` is used
 	if no value or an invalid value is set.
 	+
 	* `original` keeps old merge commit message format which takes only one line.
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 0bc6ce5b05..8fa39030d3 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -18,7 +18,7 @@ enum message_format {
 	MESSAGE_FORMAT_ORIGINAL = 0,
 	MESSAGE_FORMAT_MULTILINE = 1,
 	MESSAGE_FORMAT_AUTOSELECT = 2,
-	MESSAGE_FORMAT_DEFAULT = MESSAGE_FORMAT_ORIGINAL
+	MESSAGE_FORMAT_DEFAULT = MESSAGE_FORMAT_AUTOSELECT
 };
 
 static const char * const fmt_merge_msg_usage[] = {
-- 
2.24.1


      parent reply	other threads:[~2020-02-09 13:26 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-09 13:16 [RFC PATCH 0/3] git-merge: update default commit message i.Dark_Templar
2020-02-09 13:16 ` [RFC PATCH 1/3] git-merge: add option to format default message using multiple lines i.Dark_Templar
2020-02-09 17:44   ` Junio C Hamano
2020-02-10 18:51     ` i.Dark_Templar
2020-03-09 12:07       ` [RFC PATCH v2 0/2] git-merge: update default commit message i.Dark_Templar
2020-03-09 12:07         ` [RFC PATCH v2 1/2] git-merge: add option to format default message using multiple lines i.Dark_Templar
2020-03-09 16:20           ` Junio C Hamano
2020-03-09 19:45             ` i.Dark_Templar
2020-03-09 12:07         ` [RFC PATCH v2 2/2] Enable multiline merge commit message by default i.Dark_Templar
2020-02-09 13:16 ` [RFC PATCH 2/3] Add merge commit message type autoselect logic i.Dark_Templar
2020-02-09 13:16 ` i.Dark_Templar [this message]

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=20200209131623.5827-4-darktemplar@dark-templar-archives.net \
    --to=darktemplar@dark-templar-archives.net \
    --cc=git@vger.kernel.org \
    /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 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.