- Moved global gitignore to the expected location, remove explicit

Git configuration.
- Don't ignore all files, but set status.showUntrackedFiles to no, add
to post-merge hook.

.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]

.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

.gitignore

-*