diff --git a/gitconfig b/gitconfig
index 593fc9d..96b3d3c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,27 @@
 [alias]
     ca = commit -a
+    changes = diff --name-status -r
+    co = checkout
+    contains = branch --contains
+    cr = codereview
+    ignored = ls-files --others
+    lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold cyan)- %an%C(reset)%C(bold yellow)%d%C(reset)'
+    lgc = log ORIG_HEAD.. --stat --no-merges
+    lgp = log --pretty=format:'%Cred%h%Creset -- %cn, %cr\t%Cgreen%s%Creset'
+    mnc = merge --no-commit
+    oneline = log --oneline --decorate
+    repourl = config --get remote.origin.url
+    shallow = clone --depth=1
+    staged = diff --cached
+    tags = for-each-ref --sort='*authordate' --format='%(tag)' refs/tags
+    undo = reset --soft HEAD^
+    unpushed = cherry -v
     lol = log --graph --decorate --pretty=oneline --abbrev-commit
     lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
+    wdiff = diff --color-words
+    whatrelease = name-rev --name-only
+    who = shortlog -s --
+    wlog = log -p --word-diff=colo
 
 [apply]
     whitespace = fix
@@ -21,22 +41,35 @@
     frag = magenta bold
     old = red bold
     new = green bold
+[color "grep"]
+  match = bold magenta
+[color "interactive"]
+  prompt = normal
+  header = normal
+  help = yellow
+  error = bold red
 [color "status"]
     added = yellow
     changed = green
     untracked = cyan
 
+[core]
+	excludesfile = /Users/sidharta/.gitignore
+    whitespace = space-before-tabmtrailing-space
+    autocrlf = input
+
+[diff]
+  tool = vimdiff
+
 [github]
     user = hellerve
 
 [merge]
     log = true
 
-[core]
-    excludesfile = /Users/sidharta/.gitignore
-    whitespace = space-before-tabmtrailing-space
-    autocrlf = input
+[push]
+    default = simple
 
 [user]
-    name = Veit Heller
-    email = s0539501@htw-berlin.de
+	name = Veit Heller
+	email = s0539501@htw-berlin.de