Making git happy with a commit