diff --git a/.gitconfig b/.gitconfig
new file mode 100755
index 0000000..8d17d8d
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,18 @@
+[user]
+	name = Daniel Vedder\n
+	email = d.vedder@web.de
+
+[core]
+	editor = vim
+
+[color]
+	ui = auto
+
+[alias]
+	history = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
+	co = checkout
+	hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+	diffc = diff --cached
+
+[push]
+	default = simple

diff --git a/.gitconfig b/.gitconfig
new file mode 100755
index 0000000..8d17d8d
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,18 @@
+[user]
+	name = Daniel Vedder\n
+	email = d.vedder@web.de
+
+[core]
+	editor = vim
+
+[color]
+	ui = auto
+
+[alias]
+	history = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
+	co = checkout
+	hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+	diffc = diff --cached
+
+[push]
+	default = simple
diff --git a/README.md b/README.md
index bc2063e..6ef3f5f 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 This will set up:
 
 * fish shell
-* tmux
+* tmux, w3m
 * emacs-nox with ESS
 * Julia (latest version)
 * .gitconfig

diff --git a/.gitconfig b/.gitconfig
new file mode 100755
index 0000000..8d17d8d
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,18 @@
+[user]
+	name = Daniel Vedder\n
+	email = d.vedder@web.de
+
+[core]
+	editor = vim
+
+[color]
+	ui = auto
+
+[alias]
+	history = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
+	co = checkout
+	hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+	diffc = diff --cached
+
+[push]
+	default = simple
diff --git a/README.md b/README.md
index bc2063e..6ef3f5f 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 This will set up:
 
 * fish shell
-* tmux
+* tmux, w3m
 * emacs-nox with ESS
 * Julia (latest version)
 * .gitconfig
diff --git a/TODO b/TODO
index cc3f022..924243b 100644
--- a/TODO
+++ b/TODO
@@ -8,4 +8,6 @@
 
 * SSH config files
 
-* .gitconfig
\ No newline at end of file
+* .gitconfig
+
+* w3m
\ No newline at end of file