Hm, I wonder why git didn't just treat this as a rename as opposed to a deletion of one file and a creation of a separate file.  Would be better if it recognized the rename. Maybe use git mv?