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

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 3, 2016, 19:31 UTC
Message-ID: <xmqq7f9p6xh8.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <xmqq60p98kym.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 11 quoted lines

> Pat Thoyts <patthoyts@users.sourceforge.net> writes:
>
>> I'm just starting to catch up once again. hopefully I can be
>> a bit more reactive than recently. Merging 52285c83 looks fine. I'll
>> stick that onto the 0.20.0 head and see what else I can pick up on top.
>> There are a few from the git for windows set among others.
>
> Nice to hear from you again.  I think I have a few topics I merged
> to my tree bypassing you in the meantime. Let me get back to you
> with a list of topic tips to bring your tree in sync with what I
> have later.

I think the following lists everything that has been done bypassing your tree:

66fe3e061a ("git-gui: l10n: add Portuguese translation", 2016-05-06) 52285c8312 ("git-gui: update Japanese information", 2016-09-07) 2afe6b733e ("git-gui: respect commit.gpgsign again", 2016-09-09) b5f325cb4a ("git-gui: stop using deprecated merge syntax", 2016-09-24)

52285c8312 and 2afe6b733e are already in my 'master'; the other two are already cooking in 'next'.

So if you fetch from me and merge the above, you'd be in sync with me (I won't be in sync with you, as you would have more than I have from other places like Git for Windows set).

Thanks.