diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..a38d078
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,34 @@
+[color]
+	ui = true
+[user]
+	name = Jan Philipp Timme
+	email = jan.philipp@timme.it
+	signingkey = D66F4F7687CD68D78EA9D12D3B1C09F02E57908E
+[core]
+	editor = vim
+[push]
+	default = matching
+[alias]
+	# A more condensed diff
+	d = diff --diff-algorithm=minimal --word-diff=color
+
+	# Sign commits with gpg
+	cs = commit --gpg-sign
+
+	# Usage: git signoff-rebase [base-commit]
+	signoff-rebase = "!GIT_SEQUENCE_EDITOR='sed -i -re s/^pick/e/' sh -c 'git rebase -i $1 && while git rebase --continue; do git commit --amend --signoff --no-edit; done' -"
+	signoff-sign-rebase = "!GIT_SEQUENCE_EDITOR='sed -i -re s/^pick/e/' sh -c 'git rebase -i $1 && while git rebase --continue; do git commit --amend --signoff --gpg-sign --no-edit; done' -"
+	sign-rebase = "!GIT_SEQUENCE_EDITOR='sed -i -re s/^pick/e/' sh -c 'git rebase -i $1 && while git rebase --continue; do git commit --amend --gpg-sign --no-edit; done' -"
+
+	# Various log aliases
+	ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
+	ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
+	lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
+	le = log --oneline --decorate
+	logtree = log --graph --oneline --decorate --all
+[branch]
+	autosetuprebase = remote
+[url "ssh://jpt@review.typo3.org:29418"]
+	pushInsteadOf = git://git.typo3.org
+[init]
+	defaultBranch = master