1
0
mirror of https://github.com/github/gitignore synced 2024-11-25 21:24:23 +01:00

Merge pull request #2383 from shiftkey/patch-1

ensure the following ! rules are included
This commit is contained in:
Brendan Forster 2017-05-15 19:33:55 +10:00 committed by GitHub
commit 9a3dea4649

View File

@ -6,7 +6,7 @@
# the misuse of the repository as backup replacement. # the misuse of the repository as backup replacement.
# For development the cache directory can be safely ignored and # For development the cache directory can be safely ignored and
# therefore it is ignored. # therefore it is ignored.
/cache/ /cache/*
!/cache/index.html !/cache/index.html
# Ignore some files and directories from the custom directory. # Ignore some files and directories from the custom directory.
/custom/history/ /custom/history/
@ -22,6 +22,6 @@
# Logs files can safely be ignored. # Logs files can safely be ignored.
*.log *.log
# Ignore the new upload directories. # Ignore the new upload directories.
/upload/ /upload/*
!/upload/index.html !/upload/index.html
/upload_backup/ /upload_backup/