minor updates

[distro-setup] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index debc9e61aa09beb3680c50613c83fef4a992d6a8..0f707214da9940e592ad76140096be1634a20071 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -43,15 +43,19 @@
         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
-       useAutoBase = true
+# 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
+#      autoSetupMerge = always
+
         # git pull always does rebase by default
        autoSetupRebase = always