+tool = meld
+prompt = false
+[format]
+# This seemed like a good idea, but it broke interactive rebase, so disabled.
+# for format-patch, use --base=auto. This means we need to do
+# git branch --set-upstream-to, but that should be done automatically
+# based on other settings.
+# useAutoBase = true
+[branch]
+# Disabled as this was to be used with useAutoBase, which didn't work as expected.
+# 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
+[push]
+default = simple