From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 May 2010 03:23:10 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~171
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/ddb27a5a6b5ed74c70d56c96592b32eed415d72b?hp=c8c073c4201600b958f5d3bd9e8051b2060bd3f7

Merge branch 'maint'

* 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
index b4cf8c53e0..03d0cd2f47 100644
--- 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
index 2dd372a21d..3319b836b2 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -21,6 +21,8 @@ command=
 branch=
 reference=
 cached=
+recursive=
+init=
 files=
 nofetch=
 update=