pull: optionally rebase submodules (remote submodule changes only)

diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index d979824f9395a0cbc8ffffa9cede524589710d43..d59bf6cf5f8da394251532765f27a044c14a572d 100644 (file)
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -17,10 +17,14 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
        int i;
        int result;
 
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage(diff_cache_usage);
+
+       git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        init_revisions(&rev, prefix);
        gitmodules_config();
-       git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        rev.abbrev = 0;
+       precompose_argv(argc, argv);
 
        argc = setup_revisions(argc, argv, &rev, NULL);
        for (i = 1; i < argc; i++) {