From 021ca1b9adbb7631028b1c581c63d5a9c186b2a2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Nov 2013 20:31:50 +0100
Subject: [PATCH 1/3] The composer.lock file belongs to the repository. Do not
 ignore.

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7fdbeb4c..c9d0896d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,3 @@ publish
 # local files
 vendor
 composer.phar
-composer.lock

From 79d3709defdcd8f5eb0097b4f41b74f3530d93d1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Nov 2013 20:32:44 +0100
Subject: [PATCH 2/3] Remove all ignores that belong to users global .gitignore
 file.

---
 .gitignore | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9d0896d..d26d6c2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,50 +1,2 @@
-# Numerous always-ignore extensions
-*.diff
-*.err
-*.orig
-*.log
-*.rej
-*.swo
-*.swp
-*.vi
-*~
-*.sass-cache
-
-# OS or Editor folders
-.DS_Store
-._*
-Thumbs.db
-.cache
-.project
-.settings
-.tmproj
-nbproject
-*.sublime-project
-*.sublime-workspace
-
-# Dreamweaver added files
-_notes
-dwsync.xml
-
-# Komodo
-*.komodoproject
-.komodotools
-
-# Espresso
-*.esproj
-*.espressostorage
-
-# Rubinius
-*.rbc
-
-# Folders to ignore
-.hg
-.svn
-.CVS
-intermediate
-publish
-.idea
-
-# local files
 vendor
 composer.phar

From 6f16e5ae8e3d99ba2c442c3f4de494ea6e53a30a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Nov 2013 20:33:37 +0100
Subject: [PATCH 3/3] Only apply git ignores relative to repository root.

---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d26d6c2b..1469fe60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-vendor
-composer.phar
+/vendor
+/composer.phar