aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristofer Rye <kristofer.rye@gmail.com>2013-11-26 22:42:07 -0500
committerKristofer Rye <kristofer.rye@gmail.com>2013-11-26 22:42:07 -0500
commit38488f24407e7c6e72c9d6cd7b360bef0776ff49 (patch)
treeb71b66e783d97e4438a21f54a25c01694e03057c
parent93b7ac4c09b7c6f262d14720d35a5735a70da99e (diff)
parent80f79ec2af032edce36609e4b92861b1e1024634 (diff)
downloadgitignore-38488f24407e7c6e72c9d6cd7b360bef0776ff49.tar.gz
gitignore-38488f24407e7c6e72c9d6cd7b360bef0776ff49.zip
Merge branch 'master' into add-common-linux-compile-file-extensions
Upstream merges
-rw-r--r--Dart.gitignore7
-rw-r--r--Global/DartEditor.gitignore2
-rw-r--r--Gradle.gitignore2
3 files changed, 5 insertions, 6 deletions
diff --git a/Dart.gitignore b/Dart.gitignore
index db4229d4..f336509f 100644
--- a/Dart.gitignore
+++ b/Dart.gitignore
@@ -1,7 +1,5 @@
-// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
+// Don’t commit the following files and directories created by pub and dart2js
packages/
-.project
-.buildlog
*.js_
*.js.deps
*.js.map
@@ -11,6 +9,3 @@ pubspec.lock
// Avoid committing generated JavaScript files
*.dart.js
-
-// Check for any other incovenient files generated by OS
-// and other tools such as Eclipse, IntelliJ, etc.
diff --git a/Global/DartEditor.gitignore b/Global/DartEditor.gitignore
new file mode 100644
index 00000000..948920b4
--- /dev/null
+++ b/Global/DartEditor.gitignore
@@ -0,0 +1,2 @@
+.project
+.buildlog
diff --git a/Gradle.gitignore b/Gradle.gitignore
new file mode 100644
index 00000000..7f6823bc
--- /dev/null
+++ b/Gradle.gitignore
@@ -0,0 +1,2 @@
+.gradle
+build/