Merge branch 'maint'

gitster · gitster · commit ddb27a5a6b5e · 2010-05-01T20:23:10.000-07:00
* maint:
  index-pack: fix trivial typo in usage string
  git-submodule.sh: properly initialize shell variables
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=

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#include "exec_cmd.h"`
`12`	`12`
`13`	`13`	`static const char index_pack_usage[] =`
`14`		`-"git index-pack [-v] [-o <index-file>] [{ ---keep \| --keep=<msg> }] [--strict] { <pack-file> \| --stdin [--fix-thin] [<pack-file>] }";`
	`14`	`+"git index-pack [-v] [-o <index-file>] [{ --keep \| --keep=<msg> }] [--strict] { <pack-file> \| --stdin [--fix-thin] [<pack-file>] }";`
`15`	`15`
`16`	`16`	`struct object_entry`
`17`	`17`	`{`