summaryrefslogtreecommitdiff
path: root/builtin/update-index.c
diff options
context:
space:
mode:
authorŠtěpán Němec <stepan.nemec@gmail.com>2010-10-08 17:31:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-08 19:31:08 (GMT)
commitd0bb13663000be47d83cbe53b6c4bdc8835625cb (patch)
tree89d9f13030543ba19c8d68214ce5f9097e14fca4 /builtin/update-index.c
parent884220653f2abd381d94c5902e4cb0f237504d03 (diff)
downloadgit-d0bb13663000be47d83cbe53b6c4bdc8835625cb.zip
git-d0bb13663000be47d83cbe53b6c4bdc8835625cb.tar.gz
git-d0bb13663000be47d83cbe53b6c4bdc8835625cb.tar.bz2
Fix {update,checkout}-index usage strings
The `<file>' argument is optional in both cases (the man pages are already correct). Signed-off-by: Štěpán Němec <stepnem@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-index.c')
-rw-r--r--builtin/update-index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 3ab214d..62d9f3f 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -398,7 +398,7 @@ static void read_index_info(int line_termination)
}
static const char update_index_usage[] =
-"git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--skip-worktree|--no-skip-worktree] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] <file>...";
+"git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--skip-worktree|--no-skip-worktree] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] [<file>...]";
static unsigned char head_sha1[20];
static unsigned char merge_head_sha1[20];