Merge branch 'ja/fetch-doc'

diff --git a/builtin-diff.c b/builtin-diff.c
index 2e51f408f9f3399195604fd23d430c180a7f20a4..ffcdd055ca0b9b30bec2ce1f22e348ec15d58c81 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--;