On Wed, Aug 29, 2012 at 1:55 PM, Jeroen De Dauw jeroendedauw@gmail.com wrote:
Forgive my git ignorance here, but will merging this "merge commit" result into all original commits being in the version history, or will it just show as one huge change? In case of the later, I don't think this is an acceptable approach.
It will still show up in the history as individual commits on the right-hand side of the merge commit, same as when you do 'git checkout master; git merge mybranch; git push'.
Roan