diff options
author | Ali Servet Donmez <asd@pittle.org> | 2012-08-22 12:22:38 +0200 |
---|---|---|
committer | Ali Servet Donmez <asd@pittle.org> | 2012-08-22 12:22:38 +0200 |
commit | d08fbbd0d4739cde05a2dd7e8e8afa138586f785 (patch) | |
tree | f8d7d7a8f59a0654c09b9527df903c7057d181eb /Global | |
parent | 6f6c2eac58900f76673bce7ad75d171c24fee27d (diff) | |
parent | c160ad912ac53cfce0d3f8e7a5639afe4879247f (diff) | |
download | gitignore-d08fbbd0d4739cde05a2dd7e8e8afa138586f785.tar.gz gitignore-d08fbbd0d4739cde05a2dd7e8e8afa138586f785.zip |
Merge branch 'master' of https://github.com/github/gitignore
Diffstat (limited to 'Global')
-rw-r--r-- | Global/Archives.gitignore | 3 | ||||
-rw-r--r-- | Global/OSX.gitignore | 1 | ||||
-rw-r--r-- | Global/PhPStorm.gitignore | 1 | ||||
-rw-r--r-- | Global/Windows.gitignore | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/Global/Archives.gitignore b/Global/Archives.gitignore index 386c3330..82d3b10f 100644 --- a/Global/Archives.gitignore +++ b/Global/Archives.gitignore @@ -6,6 +6,7 @@ *.zip *.gz *.bzip +*.bz2 *.xz *.lzma @@ -19,4 +20,4 @@ *.gem *.egg *.deb -*.rpm
\ No newline at end of file +*.rpm diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore index 5ad43cc4..f9516c09 100644 --- a/Global/OSX.gitignore +++ b/Global/OSX.gitignore @@ -1,4 +1,5 @@ .DS_Store +Icon
# Thumbnails ._* diff --git a/Global/PhPStorm.gitignore b/Global/PhPStorm.gitignore new file mode 100644 index 00000000..62c89355 --- /dev/null +++ b/Global/PhPStorm.gitignore @@ -0,0 +1 @@ +.idea/
\ No newline at end of file diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore index 55f332cf..351ec9d1 100644 --- a/Global/Windows.gitignore +++ b/Global/Windows.gitignore @@ -1,5 +1,5 @@ # Windows image file caches -Thumbs.db +Thumbs.db ehthumbs.db # Folder config file |