From: i.Dark_Templar Date: Sun, 09 Feb 2020 13:16:23 GMT Subject: [RFC PATCH 3/3] Enable merge commit message type autoselect logic by default Message-ID: <20200209131623.5827-4-darktemplar@dark-templar-archives.net> In-Reply-To: <20200209131623.5827-1-darktemplar@dark-templar-archives.net> Signed-off-by: i.Dark_Templar --- 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