diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-12 17:08:13 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-23 14:23:35 +0400 |
| commit | 67e23bced6d34e6734844db26ffb9dad393bf339 (patch) | |
| tree | 3de3038cb5fcf31031cd35b39a46b66d90b1cf26 /.gitignore | |
| parent | ca1bfbeb2a78d7b4fbb6884800ba7b8e356e6609 (diff) | |
incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index 4daa37abf2c..837b1852bd1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,15 +7,25 @@ apps/inc.php 3rdparty # ignore all apps except core ones -apps/* -!apps/files -!apps/files_encryption -!apps/files_external -!apps/files_sharing -!apps/files_trashbin -!apps/files_versions -!apps/user_ldap -!apps/user_webdavauth +#/apps* +!/apps/files +!/apps/files_encryption +!/apps/files_external +!/apps/files_sharing +!/apps/files_trashbin +!/apps/files_versions +!/apps/user_ldap +!/apps/user_webdavauth +/apps/files_external/3rdparty/irodsphp/PHPUnitTest +/apps/files_external/3rdparty/irodsphp/web +/apps/files_external/3rdparty/irodsphp/prods/test +/apps/files_external/3rdparty/irodsphp/prods/tutorial +/apps/files_external/3rdparty/irodsphp/prods/test* + + +# ignore themes except the README +/themes/* +!/themes/README # just sane ignores .*.sw[po] @@ -73,4 +83,4 @@ data-autotest /tests/coverage* /tests/autoconfig* /tests/autotest* -/l10n/.tx/
\ No newline at end of file +/l10n/.tx/ |