aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/read-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-16 16:47:25 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-16 16:47:25 -0700
commit7633a5ab9a33f90fc0fb912d7403f6c21c5435c1 (patch)
treeb6c3394b841cee89fb3febfe21953da0ae398ae9 /builtin/read-tree.c
parentbd2700dbdf6551c646bc4d68b6230b63ca6eaea3 (diff)
parent3b0d24053b50d8da76de28ea5f0d3947fa3d2194 (diff)
downloadgit-7633a5ab9a33f90fc0fb912d7403f6c21c5435c1.tar.gz
Merge branch 'mg/placeholders-are-lowercase' into maint
* mg/placeholders-are-lowercase: Make <identifier> lowercase in Documentation Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines CodingGuidelines: downcase placeholders in usage messages
Diffstat (limited to 'builtin/read-tree.c')
-rw-r--r--builtin/read-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 73c89ed15b..93c92814cf 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -104,8 +104,8 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
struct unpack_trees_options opts;
int prefix_set = 0;
const struct option read_tree_options[] = {
- { OPTION_CALLBACK, 0, "index-output", NULL, "FILE",
- "write resulting index to <FILE>",
+ { OPTION_CALLBACK, 0, "index-output", NULL, "file",
+ "write resulting index to <file>",
PARSE_OPT_NONEG, index_output_cb },
OPT_SET_INT(0, "empty", &read_empty,
"only empty the index", 1),