Skip to content

Commit 71b03dc

Browse files
Rollup merge of rust-lang#84374 - CDirkx:gitignore, r=Mark-Simulacrum
Clean up .gitignore Categorizes entries in the `.gitignore` file. Other changes: - added `desktop.ini` (Windows equivalent of `.DS_Store`) - removed `.hg/` and `.hgignore`
2 parents e3b90b0 + c0d05d2 commit 71b03dc

File tree

1 file changed

+44
-26
lines changed

1 file changed

+44
-26
lines changed

.gitignore

+44-26
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,71 @@
55
# created during manual debugging and many people like to clean up instead of
66
# having git ignore such leftovers. You can use `.git/info/exclude` to
77
# configure your local ignore list.
8-
# FIXME: This needs cleanup.
9-
*~
8+
9+
## File system
10+
.DS_Store
11+
desktop.ini
12+
13+
## Editor
1014
*.swp
1115
*.swo
12-
.#*
13-
.DS_Store
16+
Session.vim
1417
.cproject
15-
.hg/
16-
.hgignore
1718
.idea
1819
*.iml
19-
__pycache__/
20-
*.py[cod]
21-
*$py.class
20+
.vscode
2221
.project
22+
.favorites.json
2323
.settings/
24+
25+
## Tool
2426
.valgrindrc
25-
.vscode
26-
.favorites.json
27-
/Makefile
28-
/build/
27+
.cargo
28+
# Included because it is part of the test case
29+
!/src/test/run-make/thumb-none-qemu/example/.cargo
30+
31+
## Configuration
2932
/config.toml
30-
/dist/
33+
/Makefile
34+
config.mk
35+
config.stamp
36+
no_llvm_build
37+
38+
## Build
3139
/dl/
3240
/doc/
3341
/inst/
3442
/llvm/
3543
/mingw-build/
36-
/src/tools/x/target
37-
# Created by default with `src/ci/docker/run.sh`:
38-
/obj/
44+
/build/
45+
/dist/
3946
/unicode-downloads
4047
/target
41-
# Generated by compiletest for incremental:
48+
/src/tools/x/target
49+
# Generated by compiletest for incremental
4250
/tmp/
51+
# Created by default with `src/ci/docker/run.sh`
52+
/obj/
53+
54+
## Temporary files
55+
*~
56+
\#*
57+
\#*\#
58+
.#*
59+
60+
## Tags
4361
tags
4462
tags.*
4563
TAGS
4664
TAGS.*
47-
\#*
48-
\#*\#
49-
config.mk
50-
config.stamp
51-
Session.vim
52-
.cargo
53-
!/src/test/run-make/thumb-none-qemu/example/.cargo
54-
no_llvm_build
65+
66+
## Python
67+
__pycache__/
68+
*.py[cod]
69+
*$py.class
70+
71+
## Node
5572
**node_modules
5673
**package-lock.json
74+
5775
# Before adding new lines, see the comment at the top.

0 commit comments

Comments
 (0)