All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Pat Thoyts <patthoyts@users.sourceforge.net>
Cc: <git@vger.kernel.org>
Subject: Re: [PATCH v2 6/6] git-gui: Update Japanese information
Date: Mon, 03 Oct 2016 18:20:51 -0700	[thread overview]
Message-ID: <xmqqfuoc52q4.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <87mvilt4jg.fsf@red.patthoyts.tk> (Pat Thoyts's message of "Tue, 04 Oct 2016 00:07:47 +0100")

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

> 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.


      reply	other threads:[~2016-10-04  1:20 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
2016-10-04  1:20                 ` Junio C Hamano [this message]

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=xmqqfuoc52q4.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=patthoyts@users.sourceforge.net \
    /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.