From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Osamu OKANO" <okano.osamu@gmail.com>,
git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH 6/7] update git-stage.po
Date: Sat, 14 May 2011 22:44:09 -0500 [thread overview]
Message-ID: <20110515034408.GA28245@elie> (raw)
In-Reply-To: <7vd3jkr6ms.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> I would rather see that done as a customized content-level merge backend,
> i.e. at the same level as binary and union merges are specified. Losing
> line number information just for the sake of the generic merge that does
> not have domain knowledge (read: "stupid") is a way suboptimal solution to
> the problem, I would think.
Oh! You are definitely right. Thank you.
next prev parent reply other threads:[~2011-05-15 3:44 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 [this message]
2011-05-15 12:51 ` Ævar Arnfjörð Bjarmason
2011-05-15 12:56 ` Jonathan Nieder
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=20110515034408.GA28245@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 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.