aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clarify node_modules commentStuart P. Bentley2014-01-071-2/+3
| | | Now linking to the official npm FAQ entry (with tl;dr) rather than straight to mikeal's blog post
* Refactor Node.gitignore with commentsStuart P. Bentley2014-01-021-7/+20
| | | | | | The "build" directory is lost in this refactor, as many JS projects do wish to include a minified/concatenated version of their source in the "build" folder in source control.
* Merge pull request #896 from github/ignore-rails-config-secretMarkus Olsson2013-12-161-0/+1
|\ | | | | Rails: Ignore config/secrets.yml
| * secrets.yml, not secret.Shawn Davenport2013-12-141-1/+1
| |
| * Rails: Ignore the new home of secret_key_base.Shawn Davenport2013-12-141-0/+1
| |
* | Merge pull request #891 from hulet/duplicate-fixMarkus Olsson2013-12-161-2/+1
|\ \ | |/ |/| Remove duplicate rule
| * Remove duplicate ruleSteve Hulet2013-12-091-2/+1
|/
* Merge pull request #785 from NickHodges/masterAdam Roben2013-11-271-0/+4
|\ | | | | Update Delphi to include new extensions
| * Merging upstreamNick Hodges2013-11-27103-622/+1180
| |\ | |/ |/|
* | Merge pull request #879 from phmarek/masterAdam Roben2013-11-271-0/+3
|\ \ | | | | | | Added file for Common Lisp.
| * | Added file for Common Lisp.Philipp Marek2013-11-271-0/+3
| | |
* | | Merge pull request #878 from minsOne/masterAdam Roben2013-11-271-0/+1
|\ \ \ | | | | | | | | Added ipa file to Objective-C.gitignore
| * | | Added ipa file to Objective-C.gitignoreminsOne2013-11-271-0/+1
| |/ /
* | | Merge pull request #788 from sjwoodr/masterAdam Roben2013-11-271-0/+3
|\ \ \ | |/ / |/| | Update Java to exclude J2ME Mobile Tools for Java
| * | Java ME update for .mtj.tmpSteve Woodruff2013-11-271-1/+1
| | |
| * | Update Java to exclude J2ME Mobile Tools for JavaSteve Woodruff2013-09-271-0/+3
| | |
* | | Merge pull request #876 from jmillerdesign/patch-2Adam Roben2013-11-261-437/+437
|\ \ \ | | | | | | | | Use absolute paths to the files to ignore
| * | | Use absolute paths to the files to ignoreJ. Miller2013-11-261-437/+437
|/ / / | | | | | | This fixes an issue where index.php within a theme directory would be ignored, when the intention was to just ignore the index.php file in the root.
* | | Merge pull request #875 from four04/add-common-linux-compile-file-extensionsAdam Roben2013-11-261-0/+2
|\ \ \ | | | | | | | | C: Ignore Some Common File Extensions for Binaries on Linux
| * \ \ Merge branch 'master' into add-common-linux-compile-file-extensionsKristofer Rye2013-11-261-0/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into add-common-linux-compile-file-extensionsKristofer Rye2013-11-262-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | More updates
| * \ \ \ \ Merge branch 'master' into add-common-linux-compile-file-extensionsKristofer Rye2013-11-266-4/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | More upstream merges
| * \ \ \ \ \ Merge branch 'master' into add-common-linux-compile-file-extensionsKristofer Rye2013-11-263-6/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upstream merges
| * \ \ \ \ \ \ Merge branch 'master' into add-common-linux-compile-file-extensionsKristofer Rye2013-11-261-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | I messed this up partially.
| * \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/github/gitignore into ↵Kristofer Rye2013-11-2695-222/+721
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-common-linux-compile-file-extensions Conflicts: C.gitignore Updates done.
| * | | | | | | | | C: Ignore Some Common File Extensions for Binaries on LinuxKristofer Rye2013-10-031-0/+2
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I use this system in a few of the projects I've contributed to, to ignore architecture-specific linux binaries.
* | | | | | | | | Merge pull request #871 from mattrubin/masterAdam Roben2013-11-261-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove duplicate line in Objective-C.gitignore
| * | | | | | | | | Remove duplicate line in Objective-C.gitignoreMatt Rubin2013-11-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern `*.xccheckout` is already ignored on line 15.
* | | | | | | | | | Merge pull request #869 from j4y/masterAdam Roben2013-11-261-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | plugin.xml shouldn't be in source control. This is a Grails plugin artifact
| * | | | | | | | | | plugin.xml shouldn't be in source controlJay Prall2013-11-211-1/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #870 from CaseyB/masterAdam Roben2013-11-261-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ignore MonoDevelop cache files
| * | | | | | | | | | Ignore MonoDevelop cache filesBorders, Casey2013-11-221-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #866 from stefan-vatov/masterAdam Roben2013-11-261-0/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Added .gitignore for Scrivener
| * | | | | | | | | Added .gitignore for ScrivenerStefan Vatov2013-11-111-0/+7
| | | | | | | | | |
* | | | | | | | | | Merge pull request #864 from oschrenk/patch-4Adam Roben2013-11-261-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Ignore worksheet directory
| * | | | | | | | | Ignore worksheet directory Oliver Schrenk2013-11-201-0/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | Since Scala IDE V3.0 has worksheets which are like a REPL session on steroids. For the worksheet to function `*.scala` files get created in a hidden `.worksheet` directory. As these are auto-generated the directory should be ignored.
* | | | | | | | | Merge pull request #862 from jaseemabid/emacsAdam Roben2013-11-261-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Ignore elpa and eshell generated files
| * | | | | | | | | Ignore elpa and eshell generated filesJaseem Abid2013-11-141-0/+7
| |/ / / / / / / /
* | | | | | | | | Merge pull request #861 from jaseemabid/elispAdam Roben2013-11-261-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Ignore file for elisp projects
| * | | | | | | | Ignore file for elisp projectsJaseem Abid2013-11-191-0/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Ignore compiled files
* | | | | | | | Merge pull request #856 from oschrenk/patch-3Adam Roben2013-11-261-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ignore files created by maven-release-plugin
| * | | | | | | | Ignore files created by maven-release-pluginOliver Schrenk2013-11-151-1/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maven Release Plugin provides a standard mechanism to release project artifacts. During the various phases of the execution the plugin create various files, especially if you do a dry run that allows you to see the changes that the plugin will perform on your pom files mvn release:prepare -D dryRun=true It will create - `release.properties` - copy of the properties to be used - `pom.xml.releaseBackup` - the pom.xml prior to any changes - `pom.xml.tag` - the pom.xml as it will look when tagged - `pom.xml.next` - the pom.xml as it will look for the next iteration
* | | | | | | | Merge pull request #853 from danieljabailey/masterAdam Roben2013-11-261-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Lazarus IDE ignore file (in global dir this time)
| * | | | | | | | Added lazarus ignore file in the global dir this timeDaniel Bailey2013-11-131-0/+0
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of https://github.com/github/gitignoreDaniel Bailey2013-11-1389-220/+576
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added lazarus gitignore fileDaniel Bailey2013-05-231-0/+12
| | | | | | | | | |
* | | | | | | | | | Merge pull request #852 from kdeldycke/patch-1Adam Roben2013-11-261-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ignore rope files.
| * | | | | | | | | | Ignore rope files.Kevin Deldycke2013-11-131-0/+3
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | Rope (https://bitbucket.org/zjes/rope_py3k/overview) is a refactoring tool for Python. It creates temporary files in `.ropeproject` to cache data. These files should be ignored by default.
* | | | | | | | | | Merge pull request #851 from rsolomo/patch-1Adam Roben2013-11-261-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | add 'build' to Node.gitignore
| * | | | | | | | | | add 'build' to Node.gitignoreRay Solomon2013-11-131-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to exclude compiled code from nodejs addons. Reference: http://nodejs.org/api/addons.html