Skip to content

Commit 1e0ae76

Browse files
committed
Merge pull request scala#2743 from retronym/topic/gitignore-in-repo
Commit .gitignore directly
2 parents 4b0eb3a + b51cb58 commit 1e0ae76

File tree

8 files changed

+42
-54
lines changed

8 files changed

+42
-54
lines changed

.gitignore

+42
Original file line numberDiff line numberDiff line change
@@ -1 +1,43 @@
1+
#
2+
# Are you tempted to edit this file?
3+
#
4+
# First consider if the changes make sense for all,
5+
# or if they are specific to your workflow/system.
6+
# If it is the latter, you can augment this list with
7+
# entries in .git/info/excludes
8+
#
9+
# see also test/files/.gitignore
10+
#
11+
12+
*.jar
13+
*~
14+
15+
build.properties
16+
17+
# target directories for ant build
118
/build/
19+
/dists/
20+
21+
# other
22+
/out/
23+
/bin/
24+
/sandbox/
25+
26+
# eclipse, intellij
27+
/.classpath
28+
/.project
29+
/src/intellij/*.iml
30+
/src/intellij/*.ipr
31+
/src/intellij/*.iws
32+
/.cache
33+
/.idea
34+
/.settings
35+
36+
# bak files produced by ./cleanup-commit
37+
*.bak
38+
39+
# Standard symbolic link to build/quick/bin
40+
qbin
41+
42+
# Mac specific, but that is common enough a dev platform to warrant inclusion.
43+
.DS_Store

gitignore.SAMPLE

-28
This file was deleted.

lib/.gitignore

-15
This file was deleted.
File renamed without changes.

test/files/codelib/.gitignore

-1
This file was deleted.

test/files/lib/.gitignore

-8
This file was deleted.

test/files/speclib/.gitignore

-1
This file was deleted.

tools/.gitignore

-1
This file was deleted.

0 commit comments

Comments
 (0)