Merge branch 'maint'

* maint:
  index-pack: fix trivial typo in usage string
  git-submodule.sh: properly initialize shell variables
This commit is contained in:
Junio C Hamano 2010-05-01 20:23:10 -07:00
commit ddb27a5a6b
2 changed files with 3 additions and 1 deletions

View file

@ -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
{

View file

@ -21,6 +21,8 @@ command=
branch=
reference=
cached=
recursive=
init=
files=
nofetch=
update=