summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2011-02-15 14:09:06 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-15 10:51:08 -0800
commit5027fa864dafd5a054aab2de6b4bae089f344fc6 (patch)
tree23ac0655a67c2fe6ede4f9e26f27170d12a9189b
parentcommit,status: describe --porcelain just like push (diff)
downloadtgif-5027fa864dafd5a054aab2de6b4bae089f344fc6.tar.xz
clone,init: describe --template using the same wording
This also corrects a wrong description for clone. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/clone.c4
-rw-r--r--builtin/init-db.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index 82a6938620..60d9a64280 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -68,8 +68,8 @@ static struct option builtin_clone_options[] = {
"initialize submodules in the clone"),
OPT_BOOLEAN(0, "recurse-submodules", &option_recursive,
"initialize submodules in the clone"),
- OPT_STRING(0, "template", &option_template, "path",
- "path the template repository"),
+ OPT_STRING(0, "template", &option_template, "template-directory",
+ "directory from which templates will be used"),
OPT_STRING(0, "reference", &option_reference, "repo",
"reference repository"),
OPT_STRING('o', "origin", &option_origin, "branch",
diff --git a/builtin/init-db.c b/builtin/init-db.c
index e3af9eaa87..4f5348eec6 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -419,7 +419,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
unsigned int flags = 0;
const struct option init_db_options[] = {
OPT_STRING(0, "template", &template_dir, "template-directory",
- "provide the directory from which templates will be used"),
+ "directory from which templates will be used"),
OPT_SET_INT(0, "bare", &is_bare_repository_cfg,
"create a bare repository", 1),
{ OPTION_CALLBACK, 0, "shared", &init_shared_repository,