diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-14 03:18:16 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-14 03:18:16 +0200 |
| commit | 4b2ff05a3b4467390a206bb56d0dcfcc39256e86 (patch) | |
| tree | 0f1c12c31cb87be17f266e70ed2896a9cff8f17c | |
| parent | e4707a8be75263e610b00b3d600144e797f576d9 (diff) | |
| parent | b7459cc5f7de19db1871a86764e3feb9106cfab9 (diff) | |
| download | forums-4b2ff05a3b4467390a206bb56d0dcfcc39256e86.tar forums-4b2ff05a3b4467390a206bb56d0dcfcc39256e86.tar.gz forums-4b2ff05a3b4467390a206bb56d0dcfcc39256e86.tar.bz2 forums-4b2ff05a3b4467390a206bb56d0dcfcc39256e86.tar.xz forums-4b2ff05a3b4467390a206bb56d0dcfcc39256e86.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10255' into develop-olympus
* nickvergessen/ticket/10255:
[ticket/10255] Add leading slash in gitignore to only ignore specified files
| -rw-r--r-- | .gitignore | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 8298f5a894..65058b2eaf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ *~ -phpunit.xml -phpBB/cache/*.php -phpBB/cache/queue.php.lock -phpBB/config.php -phpBB/files/* -phpBB/images/avatars/gallery/* -phpBB/images/avatars/upload/* -phpBB/store/* -tests/phpbb_unit_tests.sqlite2 -tests/test_config.php -tests/utf/data/*.txt +/phpunit.xml +/phpBB/cache/*.php +/phpBB/cache/queue.php.lock +/phpBB/config.php +/phpBB/files/* +/phpBB/images/avatars/gallery/* +/phpBB/images/avatars/upload/* +/phpBB/store/* +/tests/phpbb_unit_tests.sqlite2 +/tests/test_config.php +/tests/utf/data/*.txt |