Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object

[thirdparty/git.git] / builtin / diff-files.c

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 29d3e4f416746eda53c9d599d4adf92966ffff09..17bf84d18f802d3f223e7408fee644b94878b35f 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -21,9 +21,12 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
        int result;
        unsigned options = 0;
 
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage(diff_files_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);