Could you not do

git checkout master
git merge feature-x
git checkout live
git merge feature-x^


After you merge, the ref "feature-x" points to the same commit as
"master", whereas what you actually want to merge is the pre-merge
feature-x, in both situations, if you see what I mean.

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
To unsubscribe from this group, send email to
For more options, visit this group at

Reply via email to