If you use "git show" it will tell you the parents of the commit eg:

$ git show
commit 918f3de1c99697be7057c401a245bc57a788483f
Merge: 3b23866 3fce69c
Author: Daniel Murphy <yebblies@gmail.com>
Date:   Wed Jan 22 07:59:12 2014 -0800

    Merge pull request #3139 from 9rnsr/fix11968

    Issue 11968 - ICE(expression.c) Crash when deleting __FILE__

Using git show on the parents will tell you what each was:
$ git show 3b23866 
commit 3b23866da32b98426bbb94011c19bf928102e01f
Merge: e1bb12f d031e96
Author: Daniel Murphy <yebblies@gmail.com>
Date:   Wed Jan 22 05:25:46 2014 -0800

    Merge pull request #3137 from 9rnsr/fix11967

    [REG2.065a] Issue 11967 - ICE(parse.c) Parser crash

Which makes it clear that commit (the first one, or -m1) was the master branch and the other was the pull request.

In general the first one will always be the old master commit and should be set as the mainline.

As always, make sure to check in gitk or github diff or something similar that what you wanted is what actually happened before pushing to upstream.

On Thu, Jan 23, 2014 at 4:00 AM, Andrew Edwards <edwards.ac@gmail.com> wrote:

I've made four attempts at cherry-picking, all of which resulted in error identical to the following:

seireitei:dmd ace$ git cherry-pick 19a756
error: Commit 19a756f99c610b2906cc87b0e10b63b42a49a4e2 is a merge but no -m option was given.
fatal: cherry-pick failed

The step followed for this particular attempt:

    cd dmd/
    git checkout master
    git pull
    git checkout release
    git cherry-pick 19a756

From what I understand, this is caused by the particular item being picked having multiple parents. The solution would be to identify which of the parents to use as the base:

    git cherry-pick -m 1 19a756

This would designate parent #1 as the base. My question is this: How do I know which parent is the base? Is it always parent #1?

Thanks,
Andrew
_______________________________________________
dmd-beta mailing list
dmd-beta@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-beta