Re: [PATCH v2 6/6] git-gui: Update Japanese information

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 4, 2016, 01:20 UTC
Message-ID: <xmqqfuoc52q4.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <87mvilt4jg.fsf@red.patthoyts.tk>

Pat Thoyts <patthoyts@users.sourceforge.net> writes:

Show 6 quoted lines

> I've tried to merge in these branches as they appear in your version
> although I already had one patch on top of 0.20.0 for some time. I've
> tentatively pushed this up to http://github.com/patthoyts/git-gui as
> branch 'pu' with additional stuff on top of the patches you already
> have. If this looks ok to you I'll merge this to my master and send you
> a merge request to get it all synchronized.

Your 64c6b4c507 matches what I expected to see as the result of merging the above four topics on top of your 'master'. I have no opinion on the other topics that appear on top of it on the branch you pushed out, other than that I trust the maintainer of the subsystem and I'm fine to blindly pull them from you ;-)

I am not sure if f64a1a9311 ("git-gui: maintain backwards compatibility for merge syntax", 2016-10-04) makes any practical difference in the real world, though. You'd need to find somebody who grabs the newer version of git-gui that includes b5f325cb4a ("git-gui: stop using deprecated merge syntax", 2016-09-24), without having updated their copy of git-core for more than a year, given that 2.5.0 is from July last year. It would not hurt, but I am not sure if an extra invocation of "git version" is really worth it.

Thanks.