From 771ad365e4a5b67309827e443647728b652bf8c2 Mon Sep 17 00:00:00 2001 From: Daniel Schildt Date: Sat, 13 Nov 2010 05:51:29 +0800 Subject: [PATCH 1/4] Added few files to OSX.gitignore Ignore files generated by OS X that might appear on external disks: .Spotlight-V100 .Trashes --- Global/OSX.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore index 6bcf47e9..f698b569 100644 --- a/Global/OSX.gitignore +++ b/Global/OSX.gitignore @@ -4,6 +4,10 @@ Icon? # Thumbnails ._* +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + # ack & vim swap files .ackrc *.swp From ea0b4b92cb9d0de646ad7898867ee50828a124f1 Mon Sep 17 00:00:00 2001 From: Magnus Woldrich Date: Wed, 17 Nov 2010 19:54:17 +0800 Subject: [PATCH 2/4] Added Vim >= 7.3 persistent undo files --- Global/vim.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Global/vim.gitignore b/Global/vim.gitignore index 31079fd7..b02c7e00 100644 --- a/Global/vim.gitignore +++ b/Global/vim.gitignore @@ -1 +1,2 @@ .*.sw[a-z] +*.un~ From 1a711cc2430c571f63cb16e5eb0e7aeb84db2fb0 Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Fri, 19 Nov 2010 00:40:11 +0800 Subject: [PATCH 3/4] Added Wordpress (Forgot to 'git add .') --- Wordpress.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Wordpress.gitignore diff --git a/Wordpress.gitignore b/Wordpress.gitignore new file mode 100644 index 00000000..b6b5e9df --- /dev/null +++ b/Wordpress.gitignore @@ -0,0 +1,3 @@ +.htaccess +wp-config.php +wp-content/uploads/ From 9c7b92ae3b7042a80197d2b9f45b7d9b9391ca17 Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Thu, 18 Nov 2010 18:56:40 -0800 Subject: [PATCH 4/4] These should go into other gitignores, like Vim.gitignore --- Global/OSX.gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore index f698b569..5db64513 100644 --- a/Global/OSX.gitignore +++ b/Global/OSX.gitignore @@ -7,7 +7,3 @@ Icon? # Files that might appear on external disk .Spotlight-V100 .Trashes - -# ack & vim swap files -.ackrc -*.swp