Merge pull request #2897 from retronym/backport/gitignore

[backport] Commit .gitignore directly

3 files changed, 48 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..f90835d970
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,48 @@
+#
+# Are you tempted to edit this file?
+#
+# First consider if the changes make sense for all,
+# or if they are specific to your workflow/system.
+# If it is the latter, you can augment this list with
+# entries in .git/info/excludes
+#
+# see also test/files/.gitignore
+#
+
+#
+# JARs aren't checked in, they are fetched by Ant / pull_binary_libs.sh
+#
+# We could be more concise with /lib/**/*.jar but that assumes
+# a late-model git.
+#
+/lib/ant/*.jar
+/lib/*.jar
+/test/files/codelib/*.jar
+/test/files/lib/*.jar
+/test/files/speclib/instrumented.jar
+/tools/*.jar
+
+# Developer specific Ant properties
+/build.properties
+
+# target directories for ant build
+/build/
+/dists/
+
+# other
+/out/
+/bin/
+/sandbox/
+
+# eclipse, intellij
+/.classpath
+/.project
+/src/intellij/*.iml
+/src/intellij/*.ipr
+/src/intellij/*.iws
+/.cache
+/.idea
+/.settings
+
+# Standard symbolic link to build/quick/bin
+/qbin
diff --git a/gitignore.SAMPLE b/gitignore.SAMPLE
deleted file mode 100644
index 483ad4caca..0000000000
--- a/gitignore.SAMPLE
+++ /dev/null
@@ -1,35 +0,0 @@
-# see also test/files/.gitignore
-/.gitignore
-/test/files/.gitignore
-
-*.jar
-*~
-
-#sbt
-/project/target/
-/project/project/target
-
-/target/
-/src/jline/target/
-
-# target directories for ant build
-/build/
-/dists/
-
-# other
-/out/
-/bin/
-/sandbox/
-
-# eclipse, intellij
-/.classpath
-/.project
-/src/intellij/*.iml
-/src/intellij/*.ipr
-/src/intellij/*.iws
-/.cache
-/.idea
-/.settings
-
-# bak files produced by ./cleanup-commit
-*.bak
diff --git a/test/files/gitignore.SAMPLE b/test/files/.gitignore
index 161be5b55f..161be5b55f 100644
--- a/test/files/gitignore.SAMPLE
+++ b/test/files/.gitignore