1
0
mirror of https://github.com/github/gitignore synced 2024-11-25 13:14:21 +01:00
Commit Graph

3591 Commits

Author SHA1 Message Date
Carl Suster
4d45bfdb0d Merge pull request #1032 from ohnit/VisualStudioRevertPackage
Revert "Packages folder is ignored correctly".
2014-04-11 11:03:09 +10:00
Justin Howlett
9aa3e1c3a7 Revert "Packages folder is ignored correctly".
Without the asterisk at the end of the directory's path, an exception for
a file within this directory does not work.
(ex. !packages/repositories.config)

This reverts commit 0fb0fbefa5.
2014-04-10 13:57:55 -04:00
Dmitry Teslitsky
ff6032e4da Returned lost config file
OpenCart has engine file system/library/config.php that must be in version control.
2014-04-08 18:48:50 +03:00
Dmitry Teslitsky
38ba69c4d7 Merge pull request #1 from github/master
Updating fork
2014-04-08 18:38:13 +03:00
Carl Suster
b3d27fcf04 Merge branch 'fix-1022'
Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.

This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.
2014-04-06 10:38:40 +10:00
Carl Suster
5f42238331 Remove Obj-C-specific hmap & ipa from general Xcode template 2014-04-06 10:38:24 +10:00
Carl Suster
336dd397ff Remove profile from Obj-C to match #956 2014-04-06 10:35:58 +10:00
cheddar
9390b1072d Reintroduce link to npmjs
And remove my own opinions...
2014-04-04 17:33:30 -05:00
Carl Suster
f21b38a70d Merge pull request #885 from acrogenesis/patch-1
missing security_token.rb inhibits development
2014-04-05 09:31:45 +11:00
Adrian Rangel
9d4978d1c8 add notice about secret files 2014-04-04 16:25:30 -06:00
cheddar
4d30a45c9e Remove opinion from Node.js .gitignore file
This is a PR to remove the opinionated lines from the Node.js .gitignore file.

I do not believe that Github's pre-baked .gitignore files should be promulgating opinions, especially in a community that is as fresh as the Node.js community.  Questions of what should be checked in should be a decision made on an organization-by-organization basis, or left up to the individual.  Github's inclusion of opinion in these files puts unnecessary authority behind that opinion, which can have the negative side-effect of people following without thinking.
2014-04-04 10:05:58 -05:00
Carl Suster
1ee8dd15d6 Merge pull request #928 from dlion/sftp
gitignore to ignore sftp Sublime Text config file
2014-04-04 22:38:08 +11:00
Domenico LucianI
1314783d11 Moved to global 2014-04-04 12:01:26 +02:00
maieul
9b6923d08e combining numbering rule for eledmac and be less devourer 2014-04-04 09:59:55 +02:00
maieul
527d7dd551 Revert "handout"
This reverts commit 868789a441.
2014-04-04 09:47:29 +02:00
Carl Suster
6df8994de7 Merge branch 'fix-956' 2014-04-04 17:21:22 +11:00
Jim Roepcke
d598b29b04 Remove profile rule from Xcode template. Fixes #956 2014-04-04 17:21:06 +11:00
Carl Suster
4dec7596dc Merge pull request #950 from bbodenmiller/patch-1
ignore web deploy settings by default for security, but add a TODO comment
2014-04-04 13:09:45 +11:00
Carl Suster
977641c6f6 Merge pull request #1015 from carpii/master
Updated OSX.gitignore to include directories commonly created on AFP shares
2014-04-04 12:05:14 +11:00
Carl Suster
5375a285f7 Merge pull request #1010 from StuntsPT/master
Added other common compression formats to ArchLinuxPackages
2014-04-04 11:52:07 +11:00
Carl Suster
8d5279e226 Merge pull request #1012 from notbear/patch-1
Fixes uncomplete CTools by removing overly-broad and irrelevant (?) cache rule
2014-04-04 11:39:22 +11:00
Carl Suster
70f1e3a641 Merge pull request #1028 from jamiehumphries/master
Do not ignore .ncrunch* in Visual Studio projects.
2014-04-04 10:14:11 +11:00
Jamie Humphries
d6ffb3cac3 Do not ignore .ncrunch* in Visual Studio projects.
This was ignoring .ncrunchproject and .ncrunchsolution files.
NCrunch recommend that both of these files are checked in to source control.
2014-04-03 18:23:00 +01:00
Carl Suster
25ceefa81e Merge pull request #1021 from onion7878/patch-1
add delphi .dcu
2014-04-01 13:01:53 +11:00
Konstantin Koval
9707fd125c put back Xcode ignore to Objective-C. 2014-03-31 08:37:35 +02:00
ONion
b8051dba2f trim 2014-03-31 11:49:00 +08:00
ONion
28c78172be change ignore file position 2014-03-31 11:25:08 +08:00
ONion
321f851859 add delphi .dcu
.DCU (Delphi Compiled Unit) files are binary files that are used between compiling source (text) and linking the executable. They're created by the compiler, joined together in memory, combined with the startup code and put into an actual executable (.EXE/.DLL/.BPL) by the linker
2014-03-31 11:07:06 +08:00
Carl Suster
488b028df3 Merge pull request #1019 from nnuhanovic/patch-1
Add 'pom.xml.versionsBackup' to Maven template
2014-03-31 12:05:30 +11:00
Namik Nuhanovic
3244810432 Add 'pom.xml.versionsBackup'
'mvn versions:use-latest-versions' generates 'pom.xml.versionsBackup' file, because '-DgenerateBackupPoms=true' is default; see http://mojo.codehaus.org/versions-maven-plugin/use-latest-versions-mojo.html#generateBackupPoms
2014-03-31 02:52:46 +02:00
Ivan Zuzak
5342e13bc9 ensure single trailing newline 2014-03-27 17:04:56 +01:00
Ivan Zuzak
1fb5ad47f4 fixup OpenCart double-file situation 2014-03-27 17:04:02 +01:00
Carpii (iMac)
b7d5856485 Updated OSX.gitignore to include directories commonly created on AFP shares 2014-03-26 12:40:20 +00:00
Carl Suster
9e538aa9b8 Merge pull request #1014 from stevennoto/flexbuilder-fix
Added bin-release folder to FlexBuilder .gitignore
2014-03-26 12:33:17 +11:00
Steven Noto
485a600a77 Added bin-release folder
Updated to include 'bin-release' folder, another folder for generated binary builds
2014-03-25 15:14:14 -05:00
notbear
e5e18e6e53 Fixes uncomplete CTools
Ignoring cache/ makes also necessary files ignored:
modules/ctools/page_manager/plugins/cache/page_manager_context.inc
modules/ctools/plugins/cache/simple.inc
modules/ctools/plugins/cache/export_ui.inc

See: https://drupal.org/comment/7001628#comment-7001628
2014-03-24 17:14:52 +01:00
Francisco Pina Martins
22e99e7a89 Added other common compression formats. 2014-03-21 15:23:57 +00:00
Carl Suster
250a511357 Merge branch 'fix-846'
Support for Phalcon, a PHP Framework

Manually fixed up the rules in the original PR to be consistent with our
omission of the trailing asterisk elsewhere. Fixes #846.
2014-03-21 12:57:57 +11:00
Carl Suster
af6b1895dd Remove trailing asterisks in Phalcon rules 2014-03-21 12:57:41 +11:00
Carl Suster
655e5ba74d Merge branch 'fix-921'
This is #921 without the addition of editor-specific rules.
2014-03-21 12:48:39 +11:00
Torben Werner
a6cabefb87 Increase the specificity of PlayFramework rules
The original ignore was far too general and results in eliminating packages
named "db" or "project", for example. These are not that uncommon for package
names. Fixes #921.
2014-03-21 12:46:27 +11:00
Carl Suster
65196929c4 Merge pull request #967 from tjgrilley/tex-R-updates
Rules for TeX packages sagetex and sympytex; Rdata
2014-03-21 12:20:29 +11:00
Maïeul Rouquette
868789a441 handout 2014-03-20 13:50:53 +01:00
Maïeul Rouquette
aa58263826 (e)ledmac/(e)ledpar 2014-03-20 13:50:30 +01:00
Carl Suster
4cd753fd0e Merge pull request #1007 from fabiensanglard/Xcode
Extract XCode to a Global/ template
2014-03-20 10:22:50 +11:00
MacPro: Fabien Sanglard
5bd4330b8c Add Xcode support. 2014-03-19 19:14:15 -04:00
Carl Suster
369766d5b9 Merge pull request #1006 from munkhoff/add-slickedit-gitignore
Add Global/SlickEdit.gitignore template
2014-03-19 17:44:44 +11:00
John Munkhoff
ddcbdd6a17 Edit comment in Global/SlickEdit.gitignore
Remove unnecessary wording about negative ignore rules.
2014-03-18 23:37:25 -07:00
Carl Suster
2fc10c0a97 Merge pull request #998 from kylef/patch-1
[Objective-C] Comment out CocoaPods rules
2014-03-19 13:01:09 +11:00
John Munkhoff
a65b95938c Add Global/SlickEdit.gitignore file
This commit adds a global ignore file for SlickEdit, a commercial editor.

SlickEdit will create the following files when the user sets up a workspace:

*.vpw       Workspace file. Contains a list of project files associated with
            the workspace.
*.vpj       Project file. Contains the project’s settings, including the list
            of source files.
*.vpwhist   Workspace history file for Windows. Contains user session
            information (list of open files, debugger breakpoints, etc.)
*.vpwhistu  Workspace history file for UNIX/Linux/MacOSX. (Same as above.)
*.vtg       Workspace tag file. Contains a database of source code symbols.

It is assumed that GitHub users will generally not want to store their
workspace and project files in a repository, so those files are ignored
globally.  However, those files do not contain user-specific data so they
could be stored in a repository and shared among developers if desired for
a particular project.  This can be done by adding rules like ’!*.vpw’ and
‘!*.vpj’ to the project’s .gitignore file.

The workspace history and tag files contain user-specific data, so they
should not be stored in a repository.

For more information, download the PDF user guide from:
http://www.slickedit.com/products/slickedit/product-documentation

Note: The user guide is 1400 pages long and over 13MB in size.

Searching for ‘vpwhist’ will lead to the section that discusses storing
these files in a repository.
2014-03-18 16:21:03 -07:00