From 2f9d00f4200ef8183ddc8386577b0f2f0fcb5b6f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 6 Oct 2019 00:06:53 +0100
Subject: [PATCH] Rename gitignore

---
 tag-git/gitconfig        |  3 +--
 tag-git/gitignore        | 46 +++++++++++++++++++++++++++++++++++++---
 tag-git/gitignore-global | 43 -------------------------------------
 3 files changed, 44 insertions(+), 48 deletions(-)
 delete mode 100644 tag-git/gitignore-global

diff --git a/tag-git/gitconfig b/tag-git/gitconfig
index 809fe5a..f961b66 100644
--- a/tag-git/gitconfig
+++ b/tag-git/gitconfig
@@ -49,8 +49,7 @@
 	verbose = true
 
 [core]
-	# A global .gitignore file.
-	excludesFile = ~/.gitignore.global
+	excludesFile = ~/.gitignore
 
 [diff]
 	tool = vimdiff
diff --git a/tag-git/gitignore b/tag-git/gitignore
index e2f174a..bd58e56 100644
--- a/tag-git/gitignore
+++ b/tag-git/gitignore
@@ -1,3 +1,43 @@
-!.*
-.composer/cache/
-.composer/vendor/
+# Ignore archive files.
+*.7z
+*.dmg
+*.gz
+*.iso
+*.phar
+*.phar.version
+*.rar
+*.tar
+*.zip
+
+# Ignore database exports.
+*.*sql
+
+# Ignore patch files and interdiffs.
+*.patch
+*.diff
+*.rej
+*.orig
+interdiff*.txt
+
+# Ignore Vagrant directories.
+.vagrant/
+
+# Ignore logs.
+*.log
+
+# Ignore IDE and text editor files.
+.idea/
+*.sublime-*
+
+# Ignore temporary directories.
+.php_cs.cache
+tmp/
+
+# Ignore Ansible Playbook retrys.
+*.retry
+
+fabfile.pyc
+
+.DS*
+
+*.unison.*
diff --git a/tag-git/gitignore-global b/tag-git/gitignore-global
deleted file mode 100644
index bd58e56..0000000
--- a/tag-git/gitignore-global
+++ /dev/null
@@ -1,43 +0,0 @@
-# Ignore archive files.
-*.7z
-*.dmg
-*.gz
-*.iso
-*.phar
-*.phar.version
-*.rar
-*.tar
-*.zip
-
-# Ignore database exports.
-*.*sql
-
-# Ignore patch files and interdiffs.
-*.patch
-*.diff
-*.rej
-*.orig
-interdiff*.txt
-
-# Ignore Vagrant directories.
-.vagrant/
-
-# Ignore logs.
-*.log
-
-# Ignore IDE and text editor files.
-.idea/
-*.sublime-*
-
-# Ignore temporary directories.
-.php_cs.cache
-tmp/
-
-# Ignore Ansible Playbook retrys.
-*.retry
-
-fabfile.pyc
-
-.DS*
-
-*.unison.*