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

Am 23.11.2016 um 21:05 schrieb Junio C Hamano: > Johannes Sixt writes: >> 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 atte

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

Johannes Sixt writes: > 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 tr

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

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

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

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? ;) -- Hannes

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

Johannes Sixt writes: > The recent rewrite of the 'git merge' invocation in b5f325cb > (git-gui: stop using deprecated merge syntax) replaced the > subsidiary call of 'git fmt-merge-msg' to take advantage of > the capability of 'git merge' that can construct a merge log > message when the rev bei

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

The recent rewrite of the 'git merge' invocation in b5f325cb (git-gui: stop using deprecated merge syntax) replaced the subsidiary call of 'git fmt-merge-msg' to take advantage of the capability of 'git merge' that can construct a merge log message when the rev being merged is FETCH_HEAD. A disadv