From: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Date: Thu, 29 Oct 2015 17:56:35 GMT
Subject: Re: git-gui is still using old-style git-merge invocation
Message-ID: <1446141395.3199.2.camel@kaarsemaker.net>
In-Reply-To: <56325C58.1060007@kdbg.org>

On do, 2015-10-29 at 18:50 +0100, Johannes Sixt wrote:
> Performing a merge with git gui presents the following message in the
> merge result window:
> 
> warning: old-style 'git merge <msg> HEAD <commit>' is deprecated.
> Merge made by the 'recursive' strategy.
>   a | 1 +
>   1 file changed, 1 insertion(+)
>   create mode 100644 a
> 
> But I am unable to find where the invocation happens. Can somebody
> help?

git-gui/lib/merge.tcl, method _start

The command is constructed on lines 115-120 (master as of today,
 37023ba3)
-- 
Dennis Kaarsemaker
www.kaarsemaker.net