pull: optionally rebase submodules (remote submodule changes only)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 8cc648d85b586752d39079e75cf81a4ee685b622..1b4d2b346762af8e6150d88fed87409e877ca676 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1221,9 +1221,8 @@ static struct cmd_struct commands[] = {
 int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
 {
        int i;
-       if (argc < 2)
-               die(_("submodule--helper subcommand must be "
-                     "called with a subcommand"));
+       if (argc < 2 || !strcmp(argv[1], "-h"))
+               usage("git submodule--helper <command>");
 
        for (i = 0; i < ARRAY_SIZE(commands); i++) {
                if (!strcmp(argv[1], commands[i].cmd)) {