From: Sitaram Chamarty <sitaramc@gmail.com>
To: "R. Diez" <rdiezmail-buspirate@yahoo.de>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: How to diff 2 file revisions with gitk
Date: Fri, 8 Feb 2013 11:51:14 +0530 [thread overview]
Message-ID: <CAMK1S_jEbSd9=OFy++vv_S8ZP8bdFz=md7iuz3VHUQqwKDMBKA@mail.gmail.com> (raw)
In-Reply-To: <1360166273.33888.YahooMailNeo@web171204.mail.ir2.yahoo.com>
On Wed, Feb 6, 2013 at 9:27 PM, R. Diez <rdiezmail-buspirate@yahoo.de> wrote:
> Hi there:
>
> I asked a few days ago whether I could easily diff 2 file revisions with the mouse in gitk, but I got no reply yet, see here:
>
>
> How to diff two file revisions with the mouse (with gitk)
> https://groups.google.com/forum/#!topic/git-users/9znsQsTB0dE
>
> I am hoping that it was the wrong mailing list, and this one the right one. 8-)
>
> Here is the full question text again:
>
> --------8<--------8<--------8<--------8<--------
>
> I would like to start gitk, select with the mouse 2
> revisions of some file and then compare them, hopefully with an external
> diff tool, very much like I am used to with WinCVS.
>
> The closest I
> got is to start gitk with a filename as an argument, in order to
> restrict the log to that one file. Then I right-click on a commit (a
> file revision) and choose "Mark this commit". However, if I right-click
> on another commit and choose "Compare with marked commit", I get a full
> commit diff with all files, and not just the file I specified on the
> command-line arguments.
>
> Selecting a filename in the "Tree" view and choosing "Highlight this only", as I found on the Internet, does not seem to help.
>
> I have git 1.7.9 (on Cygwin). Can someone help?
>
> By the way, it would be nice if gitk could launch the external diff tool from the "Compare with marked commit" option too.
I don't know if I misunderstood the whole question because the answer
is very simple.
- start gitk
- left click the newer commit
- scroll to the older commit
- right click the older commit and choose "Diff this -> selected"
- in the bottom right pane, pick any file, right click, and choose
"External diff".
prev parent reply other threads:[~2013-02-08 6:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1360164008.49200.YahooMailNeo@web171204.mail.ir2.yahoo.com>
2013-02-06 15:57 ` How to diff 2 file revisions with gitk R. Diez
2013-02-06 18:09 ` Johannes Sixt
2013-02-08 6:21 ` Sitaram Chamarty [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='CAMK1S_jEbSd9=OFy++vv_S8ZP8bdFz=md7iuz3VHUQqwKDMBKA@mail.gmail.com' \
--to=sitaramc@gmail.com \
--cc=git@vger.kernel.org \
--cc=rdiezmail-buspirate@yahoo.de \
/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).