aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@gmail.com>2016-09-30 10:47:20 -0700
committerGitHub <noreply@github.com>2016-09-30 10:47:20 -0700
commit350d49449bcabb491f1fb05e3ac2a91717c9ef04 (patch)
tree39d8451c6e9a61835891c7bdc71aea18ab35c730
parent3d598eeceef7b1162cbbf3024db2939027a3d08a (diff)
parent25dbc8b1eaec252b896361ec3d9cc215b379d09b (diff)
downloadprotobuf-350d49449bcabb491f1fb05e3ac2a91717c9ef04.tar.gz
protobuf-350d49449bcabb491f1fb05e3ac2a91717c9ef04.tar.bz2
protobuf-350d49449bcabb491f1fb05e3ac2a91717c9ef04.zip
Merge pull request #2206 from acozzette/gitignore
Updated .gitignore with Java and JavaScript build artifacts
-rw-r--r--.gitignore11
1 files changed, 10 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index f1639bf1..ea865f4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,7 +79,8 @@ src/**/*.log
src/**/*.trs
# JavaBuild output.
-java/target
+java/core/target
+java/util/target
javanano/target
# Windows native output.
@@ -135,3 +136,11 @@ php/ext/google/protobuf/configure.in
php/ext/google/protobuf/mkinstalldirs
php/ext/google/protobuf/run-tests.php
vendor/
+
+# JavaScript artifacts
+js/commonjs_out/
+js/deps.js
+js/google-protobuf.js
+js/google/
+js/node_modules/
+js/testproto_libs.js