dotfiles

commit 7a71d43c3c5aa1696fabae2273153aff367d2c54
parent 24eb989bdac8480cdb62d98685adae593399c49f
Author: Yuval Langer <yuval.langer@gmail.com>
Date:   Sat,  1 Mar 2014 14:49:16 +0200

merge.tool, mergetool.cmd, github.user, alias.df, alias.l, push.default

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

1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/.gitconfig b/.gitconfig
@@ -12,10 +12,18 @@
 [difftool]
 	tool = meld
 [push]
-	default = simple
+	default = tracking
 [alias]
 	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