From: Johannes Sixt <j6t@kdbg•org>
To: Pat Thoyts <patthoyts@users•sourceforge.net>
Cc: Git Mailing List <git@vger•kernel.org>
Subject: [PATCH] git-gui: do not use obsolete `git merge $msg HEAD $branch'
Date: Wed, 16 Dec 2015 22:44:08 +0100 [thread overview]
Message-ID: <5671DB28.8020901@kdbg.org> (raw)
Use the modern `git merge' invocation pattern.
Since both `git merge' and `git fmt-merge-msg' obey the merge.log
configuration, instruct the former not to generate the log summary to
avoid that it appears twice in the commit message.
Signed-off-by: Johannes Sixt <j6t@kdbg•org>
---
lib/merge.tcl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/merge.tcl b/lib/merge.tcl
index 460d32f..f512456 100644
--- a/lib/merge.tcl
+++ b/lib/merge.tcl
@@ -115,8 +115,9 @@ method _start {} {
set cmd [list git]
lappend cmd merge
lappend cmd --strategy=recursive
+ lappend cmd --no-log
+ lappend cmd -m
lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
- lappend cmd HEAD
lappend cmd $name
ui_status [mc "Merging %s and %s..." $current_branch $stitle]
--
2.6.2.337.ga235d84
reply other threads:[~2015-12-16 21:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=5671DB28.8020901@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=patthoyts@users$(echo .)sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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