From: Raimund Bauer <ray007@gmx.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: 'Robin Rosenberg' <robin.rosenberg.lists@dewire.com>,
'git' <git@vger.kernel.org>
Subject: RE: [wishlist] graphical diff
Date: Mon, 19 Mar 2007 17:44:04 +0100 [thread overview]
Message-ID: <1174322644.5639.17.camel@localhost> (raw)
In-Reply-To: <Pine.LNX.4.63.0703191359380.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Hi,
On Mon, 2007-03-19 at 14:00 +0100, Johannes Schindelin wrote:
> > Maybe with a git.gui config option (like merge.tool)?
> > Or by specifying on the commandline:
> >
> > git diff --gui=<my-gui-differ> ...
> >
> > And <my-gui-differ> = xxdiff | kompare | tkdiff | ...
>
> Have you actually looked at the patch I sent? It is more logical to say
> "git -p=<bla> diff ..." when the option "-p" (without "=") already exists.
I have, and I can't see your patch doing what I want.
Sorry if I haven't made myself clear what I want, but I was thinking
about a shortcut for something like the following example sequence:
$ git show v1.4.0:git.c > git.c.v1.4.0
$ git show v1.4.4:git.c > git.c.v1.4.4
$ tkdiff git.c.v1.4.0 git.c.v1.4.4
$ rm git.c.v1.4.0 git.c.v1.4.4
Replace tkdiff with the differ of your choice.
At least for comparing 2 single blobs that behavior should be well
defined. For comparing multiple blobs, checking them out in 2 separate
directories and starting the differ with the directories could work, but
I'm more after the single-file case for now ... and that's also the one
that should be easy to start from gitk.
If there's a way to do that by setting the pager I'll be happy to do
so ;-)
> Ciao,
> Dscho
--
best regards
Ray
next prev parent reply other threads:[~2007-03-19 16:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-18 13:16 [wishlist] graphical diff Raimund Bauer
2007-03-18 15:06 ` Robin Rosenberg
2007-03-18 23:09 ` Johannes Schindelin
2007-03-18 23:51 ` Robin Rosenberg
2007-03-19 0:09 ` Johannes Schindelin
2007-03-19 8:14 ` Raimund Bauer
2007-03-19 13:00 ` Johannes Schindelin
2007-03-19 16:44 ` Raimund Bauer [this message]
2007-03-19 16:49 ` Johannes Schindelin
2007-03-19 20:29 ` Raimund Bauer
2007-03-18 21:39 ` Christian MICHON
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=1174322644.5639.17.camel@localhost \
--to=ray007@gmx.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg.lists@dewire.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).