All of lore.kernel.org
 help / color / mirror / Atom feed
From: Phil Susi <psusi@ubuntu.com>
To: git@vger.kernel.org
Subject: Compare two diffs on the command line?
Date: Fri, 4 Sep 2015 14:00:36 -0400	[thread overview]
Message-ID: <55E9DC44.90303@ubuntu.com> (raw)

If you have a commit that exists on two branches, in gitk you can mark 
one, then select the other and choose to compare the two.  This results 
in a diff of the two diffs, rather than a diff between the two trees, 
which include many other changes that have nothing to do with either commit.

Is there a way to do this on the command line?  I thought it would be 
git diff -c or --cc, but it doesn't seem to filter out all of the other 
differences between the branches.

             reply	other threads:[~2015-09-04 18:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-04 18:00 Phil Susi [this message]
2015-09-04 18:10 ` Compare two diffs on the command line? Junio C Hamano
2015-09-04 19:23   ` Phil Susi

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=55E9DC44.90303@ubuntu.com \
    --to=psusi@ubuntu.com \
    --cc=git@vger.kernel.org \
    /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.