1
0
mirror of https://github.com/github/gitignore synced 2024-12-02 16:35:44 +01:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Filip Novak 2013-09-12 17:22:27 +02:00
commit 0d9bf21257
7 changed files with 13 additions and 2 deletions

View File

@ -1,5 +1,6 @@
# Object files # Object files
*.o *.o
*.ko
# Libraries # Libraries
*.lib *.lib

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

@ -1,4 +1,4 @@
Copyright (c) 2012 GitHub, Inc. Copyright (c) 2013 GitHub, Inc.
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),

View File

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

View File

@ -16,3 +16,4 @@ capybara-*.html
rerun.txt rerun.txt
pickle-email-*.html pickle-email-*.html
.project .project
config/initializers/secret_token.rb

View File

@ -15,6 +15,9 @@ build/
[Bb]in/ [Bb]in/
[Oo]bj/ [Oo]bj/
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/
# MSTest test Results # MSTest test Results
[Tt]est[Rr]esult*/ [Tt]est[Rr]esult*/
[Bb]uild[Ll]og.* [Bb]uild[Ll]og.*