Merge branch 'maint'

* maint:
  index-pack: fix trivial typo in usage string
  git-submodule.sh: properly initialize shell variables
maint
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" #include "exec_cmd.h"


static const char index_pack_usage[] = 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 struct object_entry
{ {

View File

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