Merge branch 'maint'

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 732d4c227595873bb94224da618ce5612a7415af..348f71b46256657860a2f7f79598e1d9b19d6c54 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3626,6 +3626,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
                DIFF_OPT_SET(options, FIND_COPIES_HARDER);
        else if (!strcmp(arg, "--follow"))
                DIFF_OPT_SET(options, FOLLOW_RENAMES);
+       else if (!strcmp(arg, "--no-follow"))
+               DIFF_OPT_CLR(options, FOLLOW_RENAMES);
        else if (!strcmp(arg, "--color"))
                options->use_color = 1;
        else if (!prefixcmp(arg, "--color=")) {