I should've tested my own suggestion; I forgot where the refs get sent
to after the merges.
In my testing, I did essentially what you typed in your most recent
post, and then did git checkout master; git merge feature; git
checkout live; git merge feature.
This is after the merge into master: http://i.imgur.com/cxBNa.png
This is after the merge into live: http://i.imgur.com/sad7c.png
It seems that it's done the merge correctly, to me, and it hasn't
picked up unrelated commits. Isn't this what you want?
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to
For more options, visit this group at