diff --git a/.gitignore_global b/.config/git/ignore
similarity index 100%
rename from .gitignore_global
rename to .config/git/ignore
diff --git a/.gitconfig b/.gitconfig
index 4917d0ab60c7a70da85e81090c21673f4ed10ef2..926d462243c0aa27075c791a5ebeddf4abe06e92 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -29,8 +29,6 @@
     update-requirements = !git stash save -a -u -q && ( git ls-files '*requirements*.txt' | xargs -n1 pur -r ) && ( git commit -a -m '- Updated requirements.' || echo 'No requirements updated.' ) && git stash pop
 [color]
     grep = true
-[core]
-    excludesfile = ~/.gitignore_global
 [diff]
 	tool = meld
 [difftool]
diff --git a/.githooks/post-merge b/.githooks/post-merge
index 97b5562382713a368cb4d489372d97401abaa82c..aaa4060c06beac77a46efa66cbfe3fd64862c254 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -7,3 +7,5 @@ echo Generating SSH config
 Documents/bin/gen-ssh-config
 echo Loading dconf config
 Documents/bin/dconf-load
+echo Configuring Git repo
+git config --local status.showUntrackedFiles no
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 72e8ffc0db8aad71a934dd11e5968bd5109e54b4..0000000000000000000000000000000000000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*