After some discussion, my colleages and I have come up with:

git checkout master
git merge --no-commit release_branch
git checkout HEAD . # note dot after HEAD
git commit -a -m "Fake merge from release_branch"

Comments, alternatives welcome.

-P.


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"GitHub" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/github?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to