Merge branch 'jc/diff-merge-base-multi'
[git/git.git] / builtin / diff.c
similarity index 99%
rename from builtin-diff.c
rename to builtin/diff.c
index 62b483b..bb12863 100644 (file)
@@ -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--;