From: Tim Henigan <tim.henigan@gmail.com>
To: David Aguilar <davvid@gmail.com>
Cc: Junio C Hamano <jch@google.com>,
git@vger.kernel.org, ramsay@ramsay1.demon.co.uk
Subject: Re: [PATCH 8/9 v13] difftool: teach difftool to handle directory diffs
Date: Fri, 20 Apr 2012 12:58:18 -0400 [thread overview]
Message-ID: <CAFouetiAgJzEhYFpXF5Tgr--VMRYqweQtn4t-QFvDBaDHDTQXg@mail.gmail.com> (raw)
In-Reply-To: <CAJDDKr7JtauR8sR3YC+wj60sx9DEgf87iaDwue2Cz6FzQX_Z+Q@mail.gmail.com>
On Fri, Apr 20, 2012 at 3:34 AM, David Aguilar <davvid@gmail.com> wrote:
>
> An alternative would be teaching difftool to gracefully handle the R
> lines in the --raw output.
>
> Simply creating the files as they existed on each side is a reasonable
> start. It seems better form to handle all possible output from --raw
> anyways. It's better than pretending it doesn't exist, I think.
I like this idea best. I will send v14 (lucky 14!) with this change.
> Doing "smart" things with the rename information is hairy so it's
> certainly worth leaving that for another day.
Agreed.
prev parent reply other threads:[~2012-04-20 16:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-13 16:36 [PATCH 8/9 v13] difftool: teach difftool to handle directory diffs Tim Henigan
2012-04-15 22:20 ` David Aguilar
2012-04-16 1:01 ` David Aguilar
2012-04-16 8:16 ` David Aguilar
2012-04-17 13:25 ` Tim Henigan
2012-04-18 3:23 ` David Aguilar
2012-04-18 13:13 ` Tim Henigan
2012-04-18 16:25 ` Junio C Hamano
2012-04-18 18:28 ` Tim Henigan
2012-04-18 19:38 ` Junio C Hamano
2012-04-19 17:11 ` Tim Henigan
2012-04-19 18:49 ` Junio C Hamano
2012-04-20 7:34 ` David Aguilar
2012-04-20 16:58 ` Tim Henigan [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=CAFouetiAgJzEhYFpXF5Tgr--VMRYqweQtn4t-QFvDBaDHDTQXg@mail.gmail.com \
--to=tim.henigan@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=jch@google.com \
--cc=ramsay@ramsay1.demon.co.uk \
/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).