Skip to content

Commit 272913d

Browse files
czechboy0czechboy0
committed
Merge branch 'master' of github.com:github/gitignore into keep-scm-files
# Conflicts: # Objective-C.gitignore # Swift.gitignore
2 parents daffb4f + c4ff566 commit 272913d

51 files changed

Lines changed: 424 additions & 70 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Android.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Generated files
1212
bin/
1313
gen/
14+
out/
1415

1516
# Gradle files
1617
.gradle/
@@ -30,3 +31,6 @@ proguard/
3031

3132
# Android Studio captures folder
3233
captures/
34+
35+
# Intellij
36+
*.iml

‎Autotools.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ Makefile.in
55
# http://www.gnu.org/software/autoconf
66

77
/autom4te.cache
8+
/autoscan.log
9+
/autoscan-*.log
810
/aclocal.m4
911
/compile
12+
/config.h.in
1013
/configure
14+
/configure.scan
1115
/depcomp
1216
/install-sh
1317
/missing

‎Composer.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
composer.phar
2-
vendor/
2+
/vendor/
33

44
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
55
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file

‎D.gitignore‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Compiled Object files
2+
*.o
3+
*.obj
4+
5+
# Compiled Dynamic libraries
6+
*.so
7+
*.dylib
8+
*.dll
9+
10+
# Compiled Static libraries
11+
*.a
12+
*.lib
13+
14+
# Executables
15+
*.exe
16+
17+
# DUB
18+
.dub
19+
docs.json
20+
__dummy.html

‎Dart.gitignore‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
1-
# Don’t commit the following directories created by pub.
1+
# See https://www.dartlang.org/tools/private-files.html
2+
3+
# Files and directories created by pub
24
.buildlog
5+
.packages
6+
.project
37
.pub/
48
build/
5-
packages
6-
.packages
9+
**/packages/
710

8-
# Or the files created by dart2js.
11+
# Files created by dart2js
12+
# (Most Dart developers will use pub build to compile Dart, use/modify these
13+
# rules if you intend to use dart2js directly
14+
# Convention is to use extension '.dart.js' for Dart compiled to Javascript to
15+
# differentiate from explicit Javascript files)
916
*.dart.js
10-
*.js_
17+
*.part.js
1118
*.js.deps
1219
*.js.map
20+
*.info.json
21+
22+
# Directory created by dartdoc
23+
doc/api/
1324

14-
# Include when developing application packages.
25+
# Don't commit pubspec lock file
26+
# (Library packages only! Remove pattern if developing an application package)
1527
pubspec.lock

‎Delphi.gitignore‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
# Deployment Manager configuration file for your project. Added in Delphi XE2.
2121
# Uncomment this if it is not mobile development and you do not use remote debug feature.
2222
#*.deployproj
23+
#
24+
# C++ object files produced when C/C++ Output file generation is configured.
25+
# Uncomment this if you are not using external objects (zlib library for example).
26+
#*.obj
2327
#
2428

2529
# Delphi compiler-generated binaries (safe to delete)
@@ -37,9 +41,13 @@
3741
*.tds
3842
*.dcu
3943
*.lib
44+
*.a
45+
*.o
46+
*.ocx
4047

4148
# Delphi autogenerated files (duplicated info)
4249
*.cfg
50+
*.hpp
4351
*Resource.rc
4452

4553
# Delphi local files (user-specific info)
@@ -51,7 +59,8 @@
5159

5260
# Delphi history and backups
5361
__history/
62+
__recovery/
5463
*.~*
5564

56-
# Castalia statistics file
65+
# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
5766
*.stat

‎Drupal.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ robots.txt
1515
/MAINTAINERS.txt
1616
/UPGRADE.txt
1717
/README.txt
18-
sites/all/README.txt
18+
sites/README.txt
1919
sites/all/modules/README.txt
2020
sites/all/themes/README.txt
2121

‎Eagle.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
# comment the following line if you want to have your project file included.
1212
eagle.epf
1313

14+
# Autorouter files
15+
*.pro
16+
*.job
17+
1418
# CAM files
1519
*.$$$
1620
*.cmp
@@ -34,3 +38,7 @@ eagle.epf
3438
*.info
3539

3640
*.eps
41+
42+
# file locks introduced since 7.x
43+
*.lck
44+

‎Elixir.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/_build
2+
/cover
23
/deps
34
erl_crash.dump
45
*.ez

‎Elm.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# elm-package generated files
2+
elm-stuff/
3+
# elm-repl generated files
4+
repl-temp-*

0 commit comments

Comments
 (0)