Skip to content

Commit 5d12502

Browse files
committed
Auto merge of #33617 - sanmai-NL:gitignore_IntelliJ, r=nikomatsakis
IntelliJ support, ordering, cleanup
2 parents 5743564 + 6508553 commit 5d12502

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.gitignore

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*.elc
1818
*.epub
1919
*.exe
20-
*.pdb
2120
*.fn
2221
*.html
2322
*.kdev4
@@ -29,6 +28,7 @@
2928
*.orig
3029
*.out
3130
*.patch
31+
*.pdb
3232
*.pdf
3333
*.pg
3434
*.pot
@@ -50,6 +50,10 @@
5050
.cproject
5151
.hg/
5252
.hgignore
53+
.idea
54+
__pycache__/
55+
*.py[cod]
56+
*$py.class
5357
.project
5458
.settings/
5559
.valgrindrc
@@ -65,6 +69,7 @@
6569
/llvm/
6670
/mingw-build/
6771
/nd/
72+
/obj/
6873
/rt/
6974
/rustllvm/
7075
/src/libunicode/DerivedCoreProperties.txt
@@ -73,13 +78,10 @@
7378
/src/libunicode/PropList.txt
7479
/src/libunicode/Scripts.txt
7580
/src/libunicode/UnicodeData.txt
76-
/stage0/
77-
/stage1/
78-
/stage2/
79-
/stage3/
81+
/stage[0-9]+/
82+
/target
8083
/test/
8184
/tmp/
82-
/obj/
8385
TAGS
8486
TAGS.emacs
8587
TAGS.vi
@@ -89,11 +91,9 @@ config.mk
8991
config.stamp
9092
keywords.md
9193
lexer.ml
92-
src/.DS_Store
9394
src/etc/dl
9495
src/librustc_llvm/llvmdeps.rs
9596
tmp.*.rs
9697
version.md
9798
version.ml
9899
version.texi
99-
/target

0 commit comments

Comments
 (0)