Restore some git configs to their defaults

* merge instead of rebase
* include filename prefix in diff output
disable auto update