From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 14 Dec 2013 19:33:20 GMT
Subject: Re: Unexpected cherry-pick behaviour
Message-ID: <7vvbyrgrcv.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CALWbr2y1YDX0dzjpZoF8WL4+ND+8drurH+Wrf1wBs_-=0datOA@mail.gmail.com>

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?

> 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.