aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore16
1 files changed, 15 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 0565b5e7..798559d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,6 +87,8 @@ src/**/*.trs
java/core/target
java/util/target
javanano/target
+java/.idea
+java/**/*.iml
# Windows native output.
cmake/build
@@ -136,6 +138,8 @@ conformance/conformance-php-c
# php test output
composer.lock
php/tests/generated/
+php/tests/old_protoc
+php/tests/protobuf/
php/ext/google/protobuf/.libs/
php/ext/google/protobuf/Makefile.fragments
php/ext/google/protobuf/Makefile.global
@@ -151,8 +155,18 @@ vendor/
# JavaScript artifacts
js/commonjs_out/
+js/compatibility_tests/v3.0.0/commonjs_out*
+js/compatibility_tests/v3.0.0/protoc
+js/compatibility_tests/v3.0.0/testproto_libs1.js
+js/compatibility_tests/v3.0.0/testproto_libs1_new.js
+js/compatibility_tests/v3.0.0/testproto_libs2.js
+js/compatibility_tests/v3.0.0/testproto_libs2_new.js
js/deps.js
js/google-protobuf.js
js/google/
js/node_modules/
-js/testproto_libs.js
+js/testproto_libs1.js
+js/testproto_libs2.js
+
+# Ignore the bazel symlinks
+/bazel-*