From: David Aguilar <davvid@gmail.com>
To: Ping Yin <pkufranky@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFC] Interactive difftool
Date: Fri, 27 Mar 2009 07:51:22 -0700 [thread overview]
Message-ID: <20090327145122.GA944@gmail.com> (raw)
In-Reply-To: <46dff0320903260829j34d8c613wf9b4fcc954c8519a@mail.gmail.com>
On 0, Ping Yin <pkufranky@gmail.com> wrote:
> Before git-difftool goes to master, i want to propose a new feature to
> add to or replace the current behaviour of difftool. With current
> difftool, we can only see the diff one by one. However, sometimes what
> we want is to see the diff of selected files, or in a different order,
> just like what we can do in the gui. So here is what i propose
>
> $ git difftool --interactive [options]
> [1] diff.c | 10 +++++++++-
> [2] t/t4020-diff-external.sh | 8 ++++++++
> Choose the file you want to see the diff of: 2
>
> When the user types 2 and then <enter>, the external diff program is called
>
> Further more, instead of just type a number, a letter can be prepended
> to the number to represent different ways of diff. For example
>
> t2 (tool 2): see the diff for file 2 with the configured diff tool
> p2 (patch 2): see the diff for file 2 in the patch format
>
> What do you think?
>
> Ping Yin
That would be pretty cool. I don't know about the
merge-to-master timing and whether we'd want to include new
features before the move.
I guess most of the work would have to be done in
git-difftool-helper.sh. I had a co-worker that asked for this
exact feature just the other day (and ditto for mergetool).
Patches are welcome if you have an idea for how it could work.
Right now we get called indirectly by git-diff so I
don't know if there's an easy way to hook into it like that.
It might be a matter of changing git-difftool.perl so that it
does more of the dispatching itself.
--
David
next prev parent reply other threads:[~2009-03-27 14:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-26 15:29 [RFC] Interactive difftool Ping Yin
2009-03-27 14:51 ` David Aguilar [this message]
2009-03-27 15:23 ` Ping Yin
2009-03-28 7:32 ` Jeff King
2009-03-28 9:14 ` Ping Yin
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=20090327145122.GA944@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=pkufranky@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).