Re: git-gui is still using old-style git-merge invocation

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]