* [PATCH] git-gui: do not use obsolete `git merge $msg HEAD $branch'
@ 2015-12-16 21:44 Johannes Sixt
0 siblings, 0 replies; only message in thread
From: Johannes Sixt @ 2015-12-16 21:44 UTC (permalink / raw)
To: Pat Thoyts; +Cc: Git Mailing List
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-12-16 21:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-16 21:44 [PATCH] git-gui: do not use obsolete `git merge $msg HEAD $branch' Johannes Sixt
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).