From: Junio C Hamano <gitster@pobox.com>
To: Jonathan del Strother <maillist@steelskies.com>
Cc: Brian Foster <brian.foster@maxim-ic.com>, git@vger.kernel.org
Subject: Re: [Q] Comparing differences introduced by two commits?
Date: Wed, 22 Aug 2012 09:58:19 -0700 [thread overview]
Message-ID: <7vharuamok.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAF5DW8L=6wn6wumzwJuC=QMkb3ggZoPxOJrZf=FQEdArwNzzdw@mail.gmail.com> (Jonathan del Strother's message of "Wed, 22 Aug 2012 16:15:52 +0100")
Jonathan del Strother <maillist@steelskies.com> writes:
> On 22 August 2012 13:10, Brian Foster <brian.foster@maxim-ic.com> wrote:
> ...
>> 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.
Isn't this what interdiff is for?
>> 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
Wouldn't you see a lot of needless conflicts while doing such a cherry-pick?
I often do
git checkout A^
git cherry-pick B
git diff A
when queuing an updated patch.
next prev parent reply other threads:[~2012-08-22 16:58 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
2012-08-22 16:58 ` Junio C Hamano [this message]
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=7vharuamok.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=brian.foster@maxim-ic.com \
--cc=git@vger.kernel.org \
--cc=maillist@steelskies.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