aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-01 20:23:10 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-01 20:23:10 -0700
commitddb27a5a6b5ed74c70d56c96592b32eed415d72b (patch)
treeb835a16ef2d995f1628d6d5f280cd1bd6514e216
parentc8c073c4201600b958f5d3bd9e8051b2060bd3f7 (diff)
parented215b109fc0e352456ea2ef6a0f8375e28466d5 (diff)
downloadgit-ddb27a5a6b5ed74c70d56c96592b32eed415d72b.tar.gz
git-ddb27a5a6b5ed74c70d56c96592b32eed415d72b.tar.xz
Merge branch 'maint'
* maint: index-pack: fix trivial typo in usage string git-submodule.sh: properly initialize shell variables
-rw-r--r--builtin/index-pack.c2
-rwxr-xr-xgit-submodule.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index b4cf8c53e..03d0cd2f4 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 2dd372a21..3319b836b 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -21,6 +21,8 @@ command=
branch=
reference=
cached=
+recursive=
+init=
files=
nofetch=
update=