Re: [Q] Comparing differences introduced by two commits?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 22 August 2012 17:58, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Jonathan del Strother <maillist@xxxxxxxxxxxxxx> writes:
>
>> On 22 August 2012 13:10, Brian Foster <brian.foster@xxxxxxxxxxxx> 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.
>

True.  That sounds a better solution.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]