1
0
mirror of https://github.com/github/gitignore synced 2024-12-05 01:45:42 +01:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jens Jahnke 2013-07-05 19:11:36 +02:00
commit 578b09f4be
3 changed files with 7 additions and 1 deletions

3
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,3 @@
Since this repo includes a large and diverse number of programming languages, frameworks, editors, and ecosystems, it's *very helpful* if you can provide a link to information supporting your pull request. Up-to-date, canonical documentation that mentions the files to be ignored is best.
This ensures we can efficiently go through pull requests and keep quality high.

View File

@ -1,4 +1,4 @@
.*.s[a-w][a-z] *.s[a-w][a-z]
*.un~ *.un~
Session.vim Session.vim
.netrwhist .netrwhist

View File

@ -15,3 +15,6 @@ profile
DerivedData DerivedData
.idea/ .idea/
*.hmap *.hmap
#CocoaPods
Pods