various improvements

[distro-setup] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 00703613a8405efe81a216f502a14735f34ae572..debc9e61aa09beb3680c50613c83fef4a992d6a8 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,6 +5,7 @@
         co = checkout
         s = status
         ci = commit
+       lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
 [core]
        excludesfile = /home/ian/.gitignore_global
 [github]
@@ -25,14 +26,32 @@
 
 [gitreview]
        username = iank
+       remote = origin
 # this is for newer git version. Doesn't work for ubuntu 12.04's version
 #[push]
 #      default = simple
 [color]
        ui = auto
+       status = auto
+       branch = auto
+       interactive = auto
+       diff = auto
 # for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
 [init]
         templatedir = ~/.git_template
 [difftool]
         tool = meld
        prompt = false
+[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