From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: "Pat Thoyts" <patthoyts@gmail.com>, "René Scharfe" <l.s.r@web.de>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: [PATCH] git-gui: pass the branch name to git merge
Date: Wed, 23 Nov 2016 12:05:34 -0800 [thread overview]
Message-ID: <xmqq4m2ym06p.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <5baaf25b-6f15-8002-97ea-97c5c6a4b4e4@kdbg.org> (Johannes Sixt's message of "Wed, 23 Nov 2016 20:23:53 +0100")
Johannes Sixt <j6t@kdbg.org> 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 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...
I'll leave it up to Pat, as I do not read tcl very well ;-)
next prev parent reply other threads:[~2016-11-23 20:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 17:52 [PATCH] git-gui: pass the branch name to git merge Johannes Sixt
2016-11-22 19:16 ` Junio C Hamano
2016-11-22 20:40 ` Johannes Sixt
2016-11-23 19:23 ` Johannes Sixt
2016-11-23 20:05 ` Junio C Hamano [this message]
2016-11-23 22:36 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4m2ym06p.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=l.s.r@web.de \
--cc=patthoyts@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.