+[format]
+# for format-patch, use --base=auto. This means we need to do
+# git branch --set-upstream-to
+ useAutoBase = true
+[branch]
+# sets local branches to have the same remote tracking branch.
+# This allows the useAutoBase setting to work without having to
+# setup the branch specially with
+# git branch --set-upstream-to origin/my_branch
+# or git checkout -b my-branch origin/whatever
+ autoSetupMerge = always
+ # git pull always does rebase by default
+ autoSetupRebase = always