dotfiles

commit d6e2b250cd6ab07ade2de3a2d00924c3fe98cb67
parent 7a71d43c3c5aa1696fabae2273153aff367d2c54
Author: Yuval Langer <yuval.langer@gmail.com>
Date:   Sun, 16 Mar 2014 16:23:08 +0200

Merge remote-tracking branch 'vcsh-git/master'

Diffstat:
M
.gitconfig
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitconfig b/.gitconfig
@@ -17,13 +17,13 @@
 	lg = log --all --graph --decorate --color
 	df = diff --word-diff
 	l = log --graph --decorate --color --oneline
-[branch]
-	autosetuprebase = always
-[pull]
-	rebase = preserve
 [mergetool]
 	cmd = meld "$LOCAL" "$MERGED" "$REMOTE"
 [github]
 	user = yuvallanger
 [merge]
 	tool = meld
+[color]
+	ui = true
+[branch]
+	autosetuprebase = always