Skip to content

Commit 8338f33

Browse files
martonmiklosmartonmiklos
committed
Merge branch 'master' of https://github.com/github/gitignore into add_compilation_db_to_qt_gitignore
2 parents 1c1744a + f908e51 commit 8338f33

Some content is hidden

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

65 files changed

+1107
-70
lines changed

‎Android.gitignore‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Built application files
22
*.apk
33
*.ap_
4+
*.aab
45

56
# Files for the ART/Dalvik VM
67
*.dex
@@ -43,14 +44,15 @@ captures/
4344
.idea/caches
4445

4546
# Keystore files
46-
# Uncomment the following line if you do not want to check your keystore files in.
47+
# Uncomment the following lines if you do not want to check your keystore files in.
4748
#*.jks
49+
#*.keystore
4850

4951
# External native build folder generated in Android Studio 2.2 and later
5052
.externalNativeBuild
5153

5254
# Google Services (e.g. APIs or Firebase)
53-
google-services.json
55+
# google-services.json
5456

5557
# Freeline
5658
freeline.py
@@ -63,3 +65,13 @@ fastlane/Preview.html
6365
fastlane/screenshots
6466
fastlane/test_output
6567
fastlane/readme.md
68+
69+
# Version control
70+
vcs.xml
71+
72+
# lint
73+
lint/intermediates/
74+
lint/generated/
75+
lint/outputs/
76+
lint/tmp/
77+
# lint/reports/

‎CMake.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CMakeLists.txt.user
12
CMakeCache.txt
23
CMakeFiles
34
CMakeScripts

‎Delphi.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ __recovery/
6464

6565
# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
6666
*.stat
67+
68+
# Boss dependency manager vendor folder https://github.com/HashLoad/boss
69+
modules/

‎Drupal.gitignore‎

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,46 @@
1-
# Ignore configuration files that may contain sensitive information.
2-
sites/*/*settings*.php
3-
sites/example.sites.php
1+
# gitignore template for Drupal 8 projects
2+
#
3+
# earlier versions of Drupal are tracked in `community/Python/`
44

5-
# Ignore paths that contain generated content.
6-
files/
7-
sites/*/files
8-
sites/*/private
9-
sites/*/translations
5+
# Ignore configuration files that may contain sensitive information
6+
/sites/*/*settings*.php
7+
/sites/*/*services*.yml
108

11-
# Ignore default text files
12-
robots.txt
13-
/CHANGELOG.txt
14-
/COPYRIGHT.txt
15-
/INSTALL*.txt
9+
# Ignore paths that may contain user-generated content
10+
/sites/*/files
11+
/sites/*/public
12+
/sites/*/private
13+
/sites/*/files-public
14+
/sites/*/files-private
15+
16+
# Ignore paths that may contain temporary files
17+
/sites/*/translations
18+
/sites/*/tmp
19+
/sites/*/cache
20+
21+
# Ignore drupal core (if not versioning drupal sources)
22+
/core
23+
/modules/README.txt
24+
/profiles/README.txt
25+
/sites/README.txt
26+
/sites/example.sites.php
27+
/sites/example.settings.local.php
28+
/sites/development.services.yml
29+
/themes/README.txt
30+
/vendor
31+
/.csslintrc
32+
/.editorconfig
33+
/.eslintignore
34+
/.eslintrc.json
35+
/.gitattributes
36+
/.htaccess
37+
/autoload.php
38+
/composer.json
39+
/composer.lock
40+
/example.gitignore
41+
/index.php
1642
/LICENSE.txt
17-
/MAINTAINERS.txt
18-
/UPGRADE.txt
1943
/README.txt
20-
sites/README.txt
21-
sites/all/libraries/README.txt
22-
sites/all/modules/README.txt
23-
sites/all/themes/README.txt
24-
25-
# Ignore everything but the "sites" folder ( for non core developer )
26-
.htaccess
27-
web.config
28-
authorize.php
29-
cron.php
30-
index.php
31-
install.php
32-
update.php
33-
xmlrpc.php
34-
/includes
35-
/misc
36-
/modules
37-
/profiles
38-
/scripts
39-
/themes
44+
/robots.txt
45+
/update.php
46+
/web.config

‎Elixir.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ erl_crash.dump
77
*.ez
88
*.beam
99
/config/*.secret.exs
10+
.elixir_ls/

‎Global/Diff.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.patch
2+
*.diff

‎Global/Emacs.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,7 @@ flycheck_*.el
4343

4444
# directory configuration
4545
.dir-locals.el
46+
47+
# network security
48+
/network-security.data
49+

‎Global/Images.gitignore‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# JPEG
2+
*.jpg
3+
*.jpeg
4+
*.jpe
5+
*.jif
6+
*.jfif
7+
*.jfi
8+
9+
# JPEG 2000
10+
*.jp2
11+
*.j2k
12+
*.jpf
13+
*.jpx
14+
*.jpm
15+
*.mj2
16+
17+
# JPEG XR
18+
*.jxr
19+
*.hdp
20+
*.wdp
21+
22+
# Graphics Interchange Format
23+
*.gif
24+
25+
# RAW
26+
*.raw
27+
28+
# Web P
29+
*.webp
30+
31+
# Portable Network Graphics
32+
*.png
33+
34+
# Animated Portable Network Graphics
35+
*.apng
36+
37+
# Multiple-image Network Graphics
38+
*.mng
39+
40+
# Tagged Image File Format
41+
*.tiff
42+
*.tif
43+
44+
# Scalable Vector Graphics
45+
*.svg
46+
*.svgz
47+
48+
# Portable Document Format
49+
*.pdf
50+
51+
# X BitMap
52+
*.xbm
53+
54+
# BMP
55+
*.bmp
56+
*.dib
57+
58+
# ICO
59+
*.ico
60+
61+
# 3D Images
62+
*.3dm
63+
*.max

‎Global/JetBrains.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
.idea/**/dictionaries
99
.idea/**/shelf
1010

11+
# Generated files
12+
.idea/**/contentModel.xml
13+
1114
# Sensitive or high-churn files
1215
.idea/**/dataSources/
1316
.idea/**/dataSources.ids
@@ -58,3 +61,6 @@ fabric.properties
5861

5962
# Editor-based Rest Client
6063
.idea/httpRequests
64+
65+
# Android studio 3.1+ serialized cache file
66+
.idea/caches/build_file_checksums.ser

Global/Matlab.gitignore renamed to Global/MATLAB.gitignore

File renamed without changes.

0 commit comments

Comments
 (0)