summaryrefslogtreecommitdiff
path: root/builtin/diff-files.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/diff-files.c')
-rw-r--r--builtin/diff-files.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 15c61fd8d1..e88493ffe5 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -4,6 +4,7 @@
* Copyright (C) Linus Torvalds, 2005
*/
#include "cache.h"
+#include "config.h"
#include "diff.h"
#include "commit.h"
#include "revision.h"
@@ -20,9 +21,11 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
int result;
unsigned options = 0;
- init_revisions(&rev, prefix);
- gitmodules_config();
+ 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);
rev.abbrev = 0;
precompose_argv(argc, argv);