From: Jonathan Nieder <jrnieder@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Osamu OKANO <okano.osamu@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH 6/7] update git-stage.po
Date: Sun, 15 May 2011 07:56:03 -0500 [thread overview]
Message-ID: <20110515125603.GA3178@elie> (raw)
In-Reply-To: <BANLkTin+oceG32Xr9J+f3Kmf05P_MdDgeA@mail.gmail.com>
Ævar Arnfjörð Bjarmason wrote:
> We went over this for the main gettext series.
I mean no unkindness by this: Junio's answer was a little more
helpful.
> Having a merge strategy to deal with them would be nice, but that can
> be done by using the existing gitattributes config + msgmerge(1) to do
> the work.
Could you spell that out? I haven't seen a working example of such
configuration before, and when I tried I wasn't able to get msgmerge
to do it. I'd be happy to summarize the result of such an explanation
as an example for the gitattributes manpage.
next prev parent reply other threads:[~2011-05-15 12:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-13 13:14 [PATCH 0/7] Document translation with po4a Osamu OKANO
2011-05-13 13:14 ` [PATCH 1/7] Add new target pot in Makefile Osamu OKANO
2011-05-13 13:14 ` [PATCH 2/7] add make(shell) scripts Osamu OKANO
2011-05-13 13:14 ` [PATCH 3/7] cp git-stage.pot ja/git-stage.po Osamu OKANO
2011-05-13 13:14 ` [PATCH 4/7] translate ja/git-stage.po Osamu OKANO
2011-05-13 13:14 ` [PATCH 5/7] your file Osamu OKANO
2011-05-13 16:52 ` Junio C Hamano
2011-05-13 16:58 ` Drew Northup
2011-05-13 13:14 ` [PATCH 6/7] update git-stage.po Osamu OKANO
2011-05-13 16:53 ` Junio C Hamano
2011-05-14 13:36 ` Osamu OKANO
2011-05-14 19:21 ` Jonathan Nieder
2011-05-15 3:21 ` Junio C Hamano
2011-05-15 3:44 ` Jonathan Nieder
2011-05-15 12:51 ` Ævar Arnfjörð Bjarmason
2011-05-15 12:56 ` Jonathan Nieder [this message]
2011-05-15 13:08 ` Jonathan Nieder
2011-05-15 13:25 ` Ævar Arnfjörð Bjarmason
2011-05-15 13:51 ` Jonathan Nieder
2011-05-13 13:14 ` [PATCH 7/7] translate and remove fazzy Osamu OKANO
2011-05-13 16:48 ` [PATCH 0/7] Document translation with po4a Junio C Hamano
2011-05-14 9:14 ` Ævar Arnfjörð Bjarmason
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=20110515125603.GA3178@elie \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=okano.osamu@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 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).