Skip to content

Commit 055e25a

Browse files
committed
auto merge of rust-lang#16194 : omasanori/rust/gitignore, r=alexcrichton
I also sorted lines in .gitignore. The file might include some obsoleted lines but I left.
2 parents 46d1ee7 + 821262f commit 055e25a

File tree

1 file changed

+62
-64
lines changed

1 file changed

+62
-64
lines changed

.gitignore

+62-64
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,88 @@
1-
*~
2-
\#*\#
3-
\#*
4-
.#*
5-
*.x86
6-
*.llvm
7-
*.out
1+
*.a
2+
*.aux
3+
*.bc
84
*.boot
9-
*.rustc
5+
*.bz2
6+
*.cmi
7+
*.cmo
108
*.cmx
11-
*.dll
9+
*.cp
10+
*.cps
11+
*.d
12+
*.dSYM
1213
*.def
13-
*.exe
14-
*.a
15-
*.rlib
16-
*.so
14+
*.diff
15+
*.dll
1716
*.dylib
18-
*.orig
19-
*.cmo
20-
*.cmi
21-
*.dSYM
22-
*.d
23-
*.o
24-
*.ll
25-
*.bc
26-
*.aux
27-
*.cp
17+
*.elc
18+
*.epub
19+
*.exe
2820
*.fn
21+
*.html
2922
*.ky
30-
*.cps
23+
*.ll
24+
*.llvm
3125
*.log
26+
*.o
27+
*.orig
28+
*.out
29+
*.patch
3230
*.pdf
33-
*.epub
34-
*.html
3531
*.pg
36-
*.toc
37-
*.tp
38-
*.vr
39-
*.patch
40-
*.diff
32+
*.pot
33+
*.pyc
4134
*.rej
42-
*.swp
35+
*.rlib
36+
*.rustc
37+
*.so
4338
*.swo
39+
*.swp
4440
*.tmp
45-
*.pyc
46-
*.elc
41+
*.toc
42+
*.tp
43+
*.vr
44+
*.x86
45+
*~
46+
.#*
47+
.DS_Store
48+
.cproject
4749
.hg/
4850
.hgignore
49-
.cproject
5051
.project
52+
.settings/
5153
.valgrindrc
52-
lexer.ml
53-
TAGS
54-
TAGS.emacs
55-
TAGS.vi
56-
version.ml
57-
version.texi
54+
/*-*-*-*/
55+
/*-*-*/
5856
/Makefile
59-
config.mk
60-
/rt/
61-
/rustllvm/
62-
/test/
57+
/build
58+
/dist/
59+
/dl/
60+
/doc
6361
/inst/
62+
/llvm/
6463
/mingw-build/
65-
src/.DS_Store
66-
/tmp/
67-
/dist/
64+
/nd/
65+
/rt/
66+
/rustllvm/
6867
/stage0/
69-
/dl/
7068
/stage1/
7169
/stage2/
7270
/stage3/
73-
*.bz2
74-
/doc
75-
/nd/
76-
/llvm/
77-
version.md
78-
keywords.md
79-
x86_64-apple-darwin/
80-
x86_64-unknown-linux-gnu/
81-
i686-unknown-linux-gnu/
82-
tmp.*.rs
71+
/test/
72+
/tmp/
73+
TAGS
74+
TAGS.emacs
75+
TAGS.vi
76+
\#*
77+
\#*\#
78+
config.mk
8379
config.stamp
84-
.DS_Store
80+
keywords.md
81+
lexer.ml
82+
src/.DS_Store
8583
src/etc/dl
86-
.settings/
87-
/build
88-
i686-pc-mingw32/
8984
src/librustc_llvm/llvmdeps.rs
90-
*.pot
85+
tmp.*.rs
86+
version.md
87+
version.ml
88+
version.texi

0 commit comments

Comments
 (0)