summaryrefslogtreecommitdiff
path: root/builtin/index-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-02 03:23:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-02 03:23:10 (GMT)
commitddb27a5a6b5ed74c70d56c96592b32eed415d72b (patch)
treeb835a16ef2d995f1628d6d5f280cd1bd6514e216 /builtin/index-pack.c
parentc8c073c4201600b958f5d3bd9e8051b2060bd3f7 (diff)
parented215b109fc0e352456ea2ef6a0f8375e28466d5 (diff)
downloadgit-ddb27a5a6b5ed74c70d56c96592b32eed415d72b.zip
git-ddb27a5a6b5ed74c70d56c96592b32eed415d72b.tar.gz
git-ddb27a5a6b5ed74c70d56c96592b32eed415d72b.tar.bz2
Merge branch 'maint'
* maint: index-pack: fix trivial typo in usage string git-submodule.sh: properly initialize shell variables
Diffstat (limited to 'builtin/index-pack.c')
-rw-r--r--builtin/index-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index b4cf8c5..03d0cd2 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
{