diff --git a/gitconfig b/gitconfig
index 9614683..b9e304f 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,5 +1,45 @@
-# Das ist Git's benutzerspezifische Konfiguraionsdatei.
 [user]
-# Bitte passen Sie die folgenden Zeilen an und kommentieren Sie diese aus:
-	name = nold
 	email = nold@gnu.one
+	name = nold
+ 
+[status]
+  showUntrackedFiles = all
+
+[alias]
+  f   = fetch -v
+  l   = log --all --graph --decorate=full --pretty=fuller --date-order --full-history
+  r   = rebase origin/master master
+  c   = commit -m
+  s   = status
+  logv  = log --graph --decorate=full --date-order --full-history --date=local master HEAD
+  logvr = log --graph --decorate=full --date-order --full-history --date=local master HEAD origin/master
+  logva = log --graph --decorate=full --date-order --full-history --date=local --all
+  logpf = log --patch --follow
+  dt    = difftool
+  mt    = mergetool
+
+[push]
+  default = simple
+
+[core]
+  autocrlf = input
+
+[color]
+  ui = auto
+
+#[color "diff"]
+#    whitespace = red reverse
+[pull]
+    rebase = true
+[clean]
+    requireForce = true
+[merge]
+    tool = vimdiff3
+    conflictstyle = diff3
+    ff = only
+#[diff]
+#    tool = vimdiff
+[mergetool]
+    prompt = false
+[difftool]
+    prompt = false