From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: <git@vger.kernel.org>
Subject: Re: [PATCH v2 6/6] git-gui: Update Japanese information
Date: Tue, 04 Oct 2016 00:07:47 +0100 [thread overview]
Message-ID: <87mvilt4jg.fsf@red.patthoyts.tk> (raw)
In-Reply-To: <xmqq7f9p6xh8.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Mon, 03 Oct 2016 12:31:15 -0700")
Junio C Hamano <gitster@pobox.com> writes:
>Junio C Hamano <gitster@pobox.com> writes:
>
>> 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.
>
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.
--
Pat Thoyts http://www.patthoyts.tk/
next prev parent reply other threads:[~2016-10-03 23:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-03 14:43 [PATCH 1/6] git-gui: The term unified for remote in Japanese Satoshi Yasushima
2016-09-03 14:43 ` [PATCH 2/6] git-gui: The term unified for blame " Satoshi Yasushima
2016-09-03 14:43 ` [PATCH 4/6] git-gui: Add Japanese language code Satoshi Yasushima
2016-09-03 14:43 ` [PATCH 5/6] git-gui: Update Japanese translation Satoshi Yasushima
2016-09-03 14:43 ` [PATCH 6/6] git-gui: Update Japanese information Satoshi Yasushima
2016-09-04 6:54 ` [PATCH 1/6] git-gui: The term unified for remote in Japanese Junio C Hamano
2016-09-05 16:32 ` Satoshi Yasushima
2016-09-04 12:10 ` Jakub Narębski
2016-09-05 17:16 ` Satoshi Yasushima
2016-09-05 18:03 ` Satoshi Yasushima
2016-09-06 16:02 ` [PATCH v2 1/6] git-gui: consistently use the same word for "remote" " Satoshi Yasushima
2016-09-06 16:02 ` [PATCH v2 2/6] git-gui: consistently use the same word for "blame" " Satoshi Yasushima
2016-09-06 16:02 ` [PATCH v2 4/6] git-gui: Add Japanese language code Satoshi Yasushima
2016-09-06 16:02 ` [PATCH v2 5/6] git-gui: Update Japanese translation Satoshi Yasushima
2016-09-06 16:02 ` [PATCH v2 6/6] git-gui: Update Japanese information Satoshi Yasushima
2016-09-07 11:47 ` Satoshi Yasushima
2016-09-07 17:35 ` Junio C Hamano
2016-09-08 6:59 ` git-gui, was " Johannes Schindelin
2016-09-08 16:48 ` Junio C Hamano
2016-09-20 13:37 ` Vasco Almeida
2016-09-21 18:16 ` Junio C Hamano
2016-09-26 14:21 ` Junio C Hamano
2016-09-08 12:55 ` Satoshi Yasushima
2016-10-03 8:45 ` Pat Thoyts
2016-10-03 16:18 ` Junio C Hamano
2016-10-03 19:31 ` Junio C Hamano
2016-10-03 23:07 ` Pat Thoyts [this message]
2016-10-04 1:20 ` Junio C Hamano
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=87mvilt4jg.fsf@red.patthoyts.tk \
--to=patthoyts@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).