Merge branch 'jk/consistent-h'

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 6be1df684a8459d7d2226faf9b28fbc55ea443b5..c97069a714e42a1737b5dfa223fe39c26ad9aa67 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -23,9 +23,9 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
        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);