java.vim: set 4-space indentation

[cmccabe-etc] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 33bf39d..423382a 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -29,3 +29,5 @@
        pushInsteadOf = git://github.sf.cloudera.com/
 [merge]
        conflictstyle = diff3
+[branch]
+       autosetuprebase = always