about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hansch <dev@phansch.net>2018-09-05 13:35:57 +0200
committerPhilipp Hansch <dev@phansch.net>2018-09-05 13:35:57 +0200
commit20836d3003050d4abd313eb9fda4dc8bb6bc7f9c (patch)
tree3edf3aa5e3fa584d9832a6c5bd6415207a0588a4
parent79bec036f8cd928e74e3c26d79daf94b4a30dea1 (diff)
downloadrust-20836d3003050d4abd313eb9fda4dc8bb6bc7f9c.tar.gz
rust-20836d3003050d4abd313eb9fda4dc8bb6bc7f9c.zip
Remove duplicated .gitignore
-rw-r--r--.gitignore4
-rw-r--r--clippy_dev/.gitignore38
2 files changed, 1 insertions, 41 deletions
diff --git a/.gitignore b/.gitignore
index 5ca1e06a5e5..5fd7f2fc1a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ Cargo.lock
 /target
 /clippy_lints/target
 /clippy_workspace_tests/target
+/clippy_dev/target
 
 # Generated by dogfood
 /target_recur/
@@ -33,6 +34,3 @@ helper.txt
 *.iml
 .vscode
 .idea
-
-# Used by the Clippy build script
-min_version.txt
diff --git a/clippy_dev/.gitignore b/clippy_dev/.gitignore
deleted file mode 100644
index 5ca1e06a5e5..00000000000
--- a/clippy_dev/.gitignore
+++ /dev/null
@@ -1,38 +0,0 @@
-# Used by Travis to be able to push:
-/.github/deploy_key
-out
-
-# Compiled files
-*.o
-*.d
-*.so
-*.rlib
-*.dll
-*.pyc
-*.rmeta
-
-# Executables
-*.exe
-
-# Generated by Cargo
-Cargo.lock
-/target
-/clippy_lints/target
-/clippy_workspace_tests/target
-
-# Generated by dogfood
-/target_recur/
-
-# gh pages docs
-util/gh-pages/lints.json
-
-# rustfmt backups
-*.rs.bk
-
-helper.txt
-*.iml
-.vscode
-.idea
-
-# Used by the Clippy build script
-min_version.txt