summaryrefslogtreecommitdiff
path: root/builtin/init-db.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-25 22:25:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-25 22:25:44 (GMT)
commit6741c2e64adabfa0422b6d60db177ca88a5eca35 (patch)
tree05b2b3563bd184fd4666e294d93a67140565cb90 /builtin/init-db.c
parentf612a71cc901e34f5cf154e6605b7251744f6b95 (diff)
parent09ffc706e48f93ed622a9a61704b2f767666b30d (diff)
downloadgit-6741c2e64adabfa0422b6d60db177ca88a5eca35.zip
git-6741c2e64adabfa0422b6d60db177ca88a5eca35.tar.gz
git-6741c2e64adabfa0422b6d60db177ca88a5eca35.tar.bz2
Merge branch 'maint'
* maint: init/clone: remove short option -L and document --separate-git-dir
Diffstat (limited to 'builtin/init-db.c')
-rw-r--r--builtin/init-db.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c
index ba13a54..025aa47 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -490,7 +490,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
"specify that the git repository is to be shared amongst several users",
PARSE_OPT_OPTARG | PARSE_OPT_NONEG, shared_callback, 0},
OPT_BIT('q', "quiet", &flags, "be quiet", INIT_DB_QUIET),
- OPT_STRING('L', "separate-git-dir", &real_git_dir, "gitdir",
+ OPT_STRING(0, "separate-git-dir", &real_git_dir, "gitdir",
"separate git dir from working tree"),
OPT_END()
};