Index: create_symlinks.sh
==================================================================
--- create_symlinks.sh
+++ create_symlinks.sh
@@ -10,11 +10,11 @@
 		echo "$HOME/$2 already exists, skipping…"
 	fi
 }
 
 mkdir -p $HOME/.config
-which git >/dev/null 2>&1 && link_file gitconfig .gitconfig
+which git >/dev/null 2>&1 && link_file git .config/git ../
 if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then
 	mkdir -p $HOME/.gnupg
 	link_file gpg.conf .gnupg/gpg.conf ../
 fi
 which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf

ADDED   git/config
Index: git/config
==================================================================
--- git/config
+++ git/config
@@ -0,0 +1,37 @@
+[user]
+	name = Jonathan Schleifer
+	email = js@nil.im
+	signingkey = 30E6948FAC8042B58CB4A96EE2BCCE6B35E1AF8B
+
+[color]
+	ui = auto
+	interactive = auto
+
+[alias]
+	ci = commit -S
+	co = checkout
+	d = diff
+	ds = diff --staged
+	server = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
+	slog = log --show-signature
+	sshow = show --show-signature
+	st = status -s
+
+[format]
+	signature = Jonathan
+
+[core]
+	editor = vim
+
+[push]
+	default = matching
+
+[gpg]
+	program = gpg2
+
+[url "git@github.com:"]
+	insteadOf = https://github.com/
+	pushInsteadOf = https://github.com/
+
+[fetch]
+	fsckObjects = true

DELETED gitconfig
Index: gitconfig
==================================================================
--- gitconfig
+++ gitconfig
@@ -1,37 +0,0 @@
-[user]
-	name = Jonathan Schleifer
-	email = js@nil.im
-	signingkey = 30E6948FAC8042B58CB4A96EE2BCCE6B35E1AF8B
-
-[color]
-	ui = auto
-	interactive = auto
-
-[alias]
-	ci = commit -S
-	co = checkout
-	d = diff
-	ds = diff --staged
-	server = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
-	slog = log --show-signature
-	sshow = show --show-signature
-	st = status -s
-
-[format]
-	signature = Jonathan
-
-[core]
-	editor = vim
-
-[push]
-	default = matching
-
-[gpg]
-	program = gpg2
-
-[url "git@github.com:"]
-	insteadOf = https://github.com/
-	pushInsteadOf = https://github.com/
-
-[fetch]
-	fsckObjects = true