Merge branch 'es/grep-require-name-when-needed' into maint

diff --git a/builtin/clone.c b/builtin/clone.c
index ffdd94e8f66193626e343e4cd0b14bd12d262d0e..85b0d3155de0d9ee9257ac44acc699c004022836 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -99,10 +99,7 @@ static struct option builtin_clone_options[] = {
                    N_("don't use local hardlinks, always copy")),
        OPT_BOOL('s', "shared", &option_shared,
                    N_("setup as shared repository")),
-       { OPTION_CALLBACK, 0, "recursive", &option_recurse_submodules,
-         N_("pathspec"), N_("initialize submodules in the clone"),
-         PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, recurse_submodules_cb,
-         (intptr_t)"." },
+       OPT_ALIAS(0, "recursive", "recurse-submodules"),
        { OPTION_CALLBACK, 0, "recurse-submodules", &option_recurse_submodules,
          N_("pathspec"), N_("initialize submodules in the clone"),
          PARSE_OPT_OPTARG, recurse_submodules_cb, (intptr_t)"." },