Merge branch 'maint'

* maint: init/clone: remove short option -L and document --separate-git-dir
2011-05-25 15:25:44 -07:00
parent f612a71cc9 09ffc706e4
commit 6741c2e64a
6 changed files with 6 additions and 8 deletions
--- 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()