diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-25 22:25:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-25 22:25:44 (GMT) |
| commit | 6741c2e64adabfa0422b6d60db177ca88a5eca35 (patch) | |
| tree | 05b2b3563bd184fd4666e294d93a67140565cb90 /builtin | |
| parent | f612a71cc901e34f5cf154e6605b7251744f6b95 (diff) | |
| parent | 09ffc706e48f93ed622a9a61704b2f767666b30d (diff) | |
| download | git-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')
| -rw-r--r-- | builtin/clone.c | 2 | ||||
| -rw-r--r-- | builtin/init-db.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 49c838f..f579794 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -81,7 +81,7 @@ static struct option builtin_clone_options[] = { "path to git-upload-pack on the remote"), OPT_STRING(0, "depth", &option_depth, "depth", "create a shallow clone of that depth"), - 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() 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() }; |