update gitconfig

merge no-ff, new branches auto rebase
2014-05-15 12:25:30 -07:00
parent a3226a42ad
commit 8293e68365
1 changed files with 3 additions and 0 deletions
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -32,5 +32,8 @@
    todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *'
 [merge]
    tool = vimdiff
+    ff = false
 [push]
    default = current
+[branch]
+    autosetuprebase = always