From: Antoine Pelisse <apelisse@gmail.com>
Date: Sat, 14 Dec 2013 19:47:10 GMT
Subject: Re: Unexpected cherry-pick behaviour
Message-ID: <CALWbr2wZ2tid45u8_ew2PH7tco7XkqY=gaUFEPKm9UN8Xk9HLg@mail.gmail.com>
In-Reply-To: <7vvbyrgrcv.fsf@alter.siamese.dyndns.org>

On Sat, Dec 14, 2013 at 8:33 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Antoine Pelisse <apelisse@gmail.com> writes:
>
>> If you only want to see the diff applied to master, you
>> should run:
>>
>>     $ git diff --ours
>
> Does "git diff HEAD" have the same/similar effect?

Yes, it does produce the same output as --ours.

>> You can also have a look at what is currently being applied:
>>
>>     $ git diff :1:gcc/tree-ssa-threadedge.c :3:gcc/tree-ssa-threadedge.c
>>
>> By the way, does anybody know a better way to do that ?
>
> In a merge, you can say "git diff ...MERGE_HEAD" (three-dots).  You
> should be able to tell "git show" the commit you are trying to pick
> during a cherry-pick, I think.

Thanks,