From: "i.Dark_Templar" <darktemplar@dark-templar-archives.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
"i.Dark_Templar" <darktemplar@dark-templar-archives.net>
Subject: [RFC PATCH v2 0/2] git-merge: update default commit message
Date: Mon, 9 Mar 2020 15:07:20 +0300 [thread overview]
Message-ID: <20200309120722.4987-1-darktemplar@dark-templar-archives.net> (raw)
In-Reply-To: <2f0417b3-9e9e-f0db-ab11-92dd7cd2b29a@dark-templar-archives.net>
This series of patches updates default commit message for git-merge command.
First patch adds alternative commit message formatting where
each merged object is printed on new line
and adds configuration option to enable new message formatting
when specified number of merged commits is detected.
This feature is turned off by default in first patch.
Second patch is optional and enables new behaviour
when at least two additional commits are merged.
i.Dark_Templar (2):
git-merge: add option to format default message using multiple lines
Enable multiline merge commit message by default
Documentation/config/fmt-merge-msg.txt | 9 ++
builtin/fmt-merge-msg.c | 115 ++++++++++++++++++++++++-
2 files changed, 122 insertions(+), 2 deletions(-)
--
2.24.1
next prev parent reply other threads:[~2020-03-09 12:10 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 ` i.Dark_Templar [this message]
2020-03-09 12:07 ` [RFC PATCH v2 1/2] " 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 ` [RFC PATCH 3/3] Enable merge commit message type autoselect logic by default i.Dark_Templar
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200309120722.4987-1-darktemplar@dark-templar-archives.net \
--to=darktemplar@dark-templar-archives.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).