Merge branch 'maint'

* maint: index-pack: fix trivial typo in usage string git-submodule.sh: properly initialize shell variables
git-mirror · May 2, 2010 · ddb27a5 · ddb27a5
2 parents c8c073c + ed215b1
commit ddb27a5
Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
@@ -11,7 +11,7 @@
 #include "exec_cmd.h"
 
 static const char index_pack_usage[] =
-"git index-pack [-v] [-o <index-file>] [{ ---keep | --keep=<msg> }] [--strict] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }";
+"git index-pack [-v] [-o <index-file>] [{ --keep | --keep=<msg> }] [--strict] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }";
 
 struct object_entry
 {

diff --git a/git-submodule.sh b/git-submodule.sh
@@ -21,6 +21,8 @@ command=
 branch=
 reference=
 cached=
+recursive=
+init=
 files=
 nofetch=
 update=