requiring a commit after a pull seems suspecious...