All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan del Strother <maillist@steelskies.com>
To: Brian Foster <brian.foster@maxim-ic.com>
Cc: git@vger.kernel.org
Subject: Re: [Q] Comparing differences introduced by two commits?
Date: Wed, 22 Aug 2012 16:15:52 +0100	[thread overview]
Message-ID: <CAF5DW8L=6wn6wumzwJuC=QMkb3ggZoPxOJrZf=FQEdArwNzzdw@mail.gmail.com> (raw)
In-Reply-To: <2794881.R5SsgFdXjR@laclwks004>

On 22 August 2012 13:10, Brian Foster <brian.foster@maxim-ic.com> wrote:
>
> Hello,
>
>  I have two commits A and B.  They are on separate branches.
>  Commit A is a older version of B.  I want to see what, if
>  any, differences there are between what commit A changes
>  and what commit B changes.  (The relative positions of
>  two commits may also differ in the two branches; that is,
>  there may have been some commit re-ordering.)
>
>  Ideally, the contents of the commit-message are also taken
>  into account (albeit things like the commit-Id, dates, and
>  so on will differ and therefore should be ignored).
>
>  I realize the history leading up to each commit can itself
>  cause what the commits change to differ, even if the "net
>  result" of the two commits is the same.  For my purposes,
>  this is a noise issue, and I'm happy to consider A and B
>  as not causing the same changes (i.e., as being different),
>  albeit if the only difference is the line numbers, then it
>  would be nice to ignore that.
>
>  In the past I've done:
>
>     diff <(git show A) <(git show B)
>
>  which produces rather messy output but is Ok when dealing
>  with just one or two sets of A/B commits.  I now have a
>  large-ist set of A/B commits, and the above is impractical.
>
>  Some searching hasn't found any suggestions I'm too happy
>  with, albeit I've very possibly overlooked something.

What about cherry picking B onto A, then showing the cherry-picked commit?

Off the top of my head :

git checkout A
git cherry-pick B
git show HEAD

-Jonathan

  reply	other threads:[~2012-08-22 16:09 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-22 12:10 [Q] Comparing differences introduced by two commits? Brian Foster
2012-08-22 15:15 ` Jonathan del Strother [this message]
2012-08-22 16:58   ` Junio C Hamano
2012-08-22 17:55     ` Jonathan del Strother
2012-08-24  8:52       ` Brian Foster

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='CAF5DW8L=6wn6wumzwJuC=QMkb3ggZoPxOJrZf=FQEdArwNzzdw@mail.gmail.com' \
    --to=maillist@steelskies.com \
    --cc=brian.foster@maxim-ic.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.