Re: [PATCH] git-gui: pass the branch name to git merge

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

 



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




[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]