1 files changed, 32 insertions, 0 deletions
diff --git a/git/config b/git/config
new file mode 100644
index 0000000..dce751c
--- /dev/null
+++ b/git/config
@@ -0,0 +1,32 @@
+[user]
+	name = Alexander Sulfrian
+	email = alex@spline.inf.fu-berlin.de
+
+[color]
+	diff = auto
+	status = auto
+	branch = auto
+
+[alias]
+	s = status
+	d = diff
+	co = checkout
+	ci = commit
+	b = branch
+	sta = stash
+	civ = commit -v
+	cim = commit -m
+	k = !gitk --all
+	fm = merge --ff-only
+	nfm = merge --no-ff
+	tags = tag
+	l = log --graph --all --abbrev-commit --decorate --format=oneline
+
+[core]
+	pager = less -X -R -F
+
+[merge]
+	log = true
+
+[rerere]
+	enabled = true