[3/10] git commit: added merges to base cli documentation

[fi...@apache.org]

added merges to base cli documentation


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/30f2d5cf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/30f2d5cf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/30f2d5cf

Branch: refs/heads/master
Commit: 30f2d5cf32b12ba79063554e46fdab903202e4ff
Parents: a94d290
Author: michael.wolf <mi...@MWolf-MBP.local>
Authored: Sat Mar 2 13:09:25 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/30f2d5cf/.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/*