From 9dd9b2972c4c526109f4fb57f936b67290ace003 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 12 Apr 2014 09:56:37 +0100
Subject: Rename gitignore for better linking

---
 gitconfig        |  2 +-
 gitignore        | 29 +++++++++++++++++++++++++++++
 global.gitignore | 29 -----------------------------
 3 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 gitignore
 delete mode 100644 global.gitignore

diff --git a/gitconfig b/gitconfig
index 0915a234..7c21d74f 100644
--- a/gitconfig
+++ b/gitconfig
@@ -22,4 +22,4 @@
 [diff]
 	algorithm = patience
 [core]
-	excludesfile = ~/projects/dotfiles/global.gitignore
+	excludesfile = ~/.gitignore
diff --git a/gitignore b/gitignore
new file mode 100644
index 00000000..7e23dcab
--- /dev/null
+++ b/gitignore
@@ -0,0 +1,29 @@
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+Desktop.ini
+
+# Thumbnails
+._*
+Thumbs.db
+
+# Emacs
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
+.\#*
+
+.envrc
+
+# Org-mode
+.org-id-locations
+*_archive
+
+GPATH
+GRTAGS
+GTAGS
\ No newline at end of file
diff --git a/global.gitignore b/global.gitignore
deleted file mode 100644
index 7e23dcab..00000000
--- a/global.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-Desktop.ini
-
-# Thumbnails
-._*
-Thumbs.db
-
-# Emacs
-*~
-\#*\#
-/.emacs.desktop
-/.emacs.desktop.lock
-.elc
-auto-save-list
-tramp
-.\#*
-
-.envrc
-
-# Org-mode
-.org-id-locations
-*_archive
-
-GPATH
-GRTAGS
-GTAGS
\ No newline at end of file
-- 
cgit 1.4.1