Re: Unexpected cherry-pick behaviour

Antoine Pelisse [off-list ref] 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.

On Sat, Dec 14, 2013 at 8:33 PM, Junio C Hamano [off-list ref] wrote:

Antoine Pelisse [off-list ref] writes:

quoted

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.

quoted

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,