On Sat, Dec 14, 2013 at 8:33 PM, Junio C Hamano <gits...@pobox.com> wrote:
> Antoine Pelisse <apeli...@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.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html