diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 83d8705..e2a1227 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -11,7 +11,13 @@
 	email = marcus.bengtsson@hiq.se
 [diff]
 	tool = kdiff3
+	guitool = kdiff3
 [difftool]
 	prompt = false
 [merge]
 	tool = kdiff3
+[difftool "kdiff3"]
+	path = /usr/local/bin/kdiff3
+[alias] 
+    tree = log --oneline --decorate --all --graph 
+    pulls = !git pull && git submodule init && git submodule

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 83d8705..e2a1227 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -11,7 +11,13 @@
 	email = marcus.bengtsson@hiq.se
 [diff]
 	tool = kdiff3
+	guitool = kdiff3
 [difftool]
 	prompt = false
 [merge]
 	tool = kdiff3
+[difftool "kdiff3"]
+	path = /usr/local/bin/kdiff3
+[alias] 
+    tree = log --oneline --decorate --all --graph 
+    pulls = !git pull && git submodule init && git submodule
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index fffbe16..70e7232 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -29,3 +29,5 @@
 alias ips="ifconfig -a | perl -nle'/(\d+\.\d+\.\d+\.\d+)/ && print $1'"
 
 alias elasticsearch=~/Development/elasticsearch-1.5.2/bin/elasticsearch
+
+alias scala="scala -Dscala.color=true"