Skip to content

Commit 82e9762

Browse files
authored
Rollup merge of #63373 - RalfJung:gitignore, r=alexcrichton
gitignore: add comment explaining policy Based on #63307 (comment), I added a comment what I think should be gitignored and what not. This is just a proposal, obviously. Also see #53768 for some more discussion. The summary is that if there are junk files that you create locally and are fine leaving around (such as `mir_dump`), git has the option for you to add them to `.git/info/exclude`. Others might prefer to keep their working dir clean of those same junk files, so we shouldn't just ignore them for everyone. I then also cleaned up a few more things, but there were many things that I had no idea where they came from so I didn't touch them.
2 parents 74b22c9 + 798767c commit 82e9762

File tree

2 files changed

+7
-68
lines changed

2 files changed

+7
-68
lines changed

.gitignore

+7-22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This file should only ignore things that are generated during a build,
2+
# generated by common IDEs, and optional files controlled by the user
3+
# that affect the build (such as config.toml).
4+
# FIXME: This needs cleanup.
15
*~
26
.#*
37
.DS_Store
@@ -14,20 +18,16 @@ __pycache__/
1418
.valgrindrc
1519
.vscode
1620
.favorites.json
17-
/*-*-*-*/
18-
/*-*-*/
1921
/Makefile
20-
/build
22+
/build/
2123
/config.toml
2224
/dist/
2325
/dl/
24-
/doc
26+
/doc/
2527
/inst/
2628
/llvm/
2729
/mingw-build/
28-
/nd/
2930
/obj/
30-
/rt/
3131
/rustllvm/
3232
/src/libcore/unicode/DerivedCoreProperties.txt
3333
/src/libcore/unicode/DerivedNormalizationProps.txt
@@ -37,11 +37,7 @@ __pycache__/
3737
/src/libcore/unicode/SpecialCasing.txt
3838
/src/libcore/unicode/UnicodeData.txt
3939
/src/libcore/unicode/downloaded
40-
/stage[0-9]+/
41-
/target
42-
target/
43-
/test/
44-
/tmp/
40+
/target/
4541
tags
4642
tags.*
4743
TAGS
@@ -50,17 +46,6 @@ TAGS.*
5046
\#*\#
5147
config.mk
5248
config.stamp
53-
keywords.md
54-
lexer.ml
5549
Session.vim
56-
src/etc/dl
57-
tmp.*.rs
58-
version.md
59-
version.ml
60-
version.texi
6150
.cargo
62-
!src/vendor/**
63-
/src/target/
64-
6551
no_llvm_build
66-

src/.gitignore

-46
This file was deleted.

0 commit comments

Comments
 (0)