From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 23 Nov 2016 19:23:53 GMT
Subject: Re: [PATCH] git-gui: pass the branch name to git merge
Message-ID: <5baaf25b-6f15-8002-97ea-97c5c6a4b4e4@kdbg.org>
In-Reply-To: <1dc28731-9000-c3bf-fbed-0cb17c230d8b@kdbg.org>

Am 22.11.2016 um 21:40 schrieb Johannes Sixt:
> Am 22.11.2016 um 20:16 schrieb Junio C Hamano:
>> Can't this be handled on the "git merge FETCH_HEAD" codepath
>> instead?
>
> Absolutely. Any takers? ;)

I attempted to fix git merge FETCH_HEAD, but I do not see a trivial 
solution.

But on second thought, we have an excuse to pick my proposed git-gui 
change anyway: Without that change and a fix in git-merge only, there is 
still a regression for all users who use the latest git-gui but some git 
version between 2.5.0 and the fixed git-merge...

-- Hannes