Hi folks, I think one of my coworkers has stumbled on a git bug -- if you amend a merge commit, and then pull, your amends are lost.
Is this expected behavior? I've reproduced the problem in a script (attached). I ran it against a couple of versions of git (1.7.1, 1.7.9, 1.8.4, 2.0.0) and in each case it seemed to lose the amend. - Dave