Merge branch 'jc/diff-merge-base-multi'

[git.git] / builtin / diff.c

diff --git a/builtin-diff.c b/builtin/diff.c
similarity index 99%
rename from builtin-diff.c
rename to builtin/diff.c
index 192cbb212ea00102c838fc6c8af8b9eda9d05750..89ae89cde1e6d8a0a2e02209f5396263a81bda5b 100644 (file)
--- a/builtin-diff.c
+++ b/builtin/diff.c
@@ -218,6 +218,8 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv
                        revs->max_count = 3;
                else if (!strcmp(argv[1], "-q"))
                        options |= DIFF_SILENT_ON_REMOVED;
+               else if (!strcmp(argv[1], "-h"))
+                       usage(builtin_diff_usage);
                else
                        return error("invalid option: %s", argv[1]);
                argv++; argc--;