[merge]
tool = vimdiff
+[push]
+ # When running git push without a refspec push only the current
+ # branch, see man page git-config(1) for details.
+ default = simple
+
[format]
# When using git format-patch use threads and add all patches as
# replies to the first one.
[transfer]
# Automatically fsck objects when receiving them (respected by git
# receive-pack and git fetch (>= 1.7.8, for fetch)).
- fsckobjects = true
+ fsckobjects = yes
# vim: ft=gitconfig