You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by gt...@apache.org on 2013/03/22 23:49:52 UTC
[07/14] git commit: Revert "Revert "added merges to base cli
documentation""
Revert "Revert "added merges to base cli documentation""
This reverts commit e2158347fa41ccf7ae0538ab7a1705df5d2b953f.
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/c20111f0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/c20111f0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/c20111f0
Branch: refs/heads/next
Commit: c20111f059770d8a8d95aa02ede1ea370c9a9a2a
Parents: 6dd5410
Author: michael.wolf <mi...@MWolf-MBP.local>
Authored: Sat Mar 2 13:13:57 2013 -0500
Committer: Fil Maj <ma...@gmail.com>
Committed: Mon Mar 4 10:47:31 2013 -0800
----------------------------------------------------------------------
.gitignore | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/c20111f0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 1228061..3abe651 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,8 @@ spec/fixtures/projects/native
spec/fixtures/projects/cordova
lib/cordova-android/framework/bin
lib/cordova-android/framework/gen
+.idea/*
+spec/fixtures/*
+.gitcore
+*.jar
+lib/*