diff: add --detect-copies-harder as a synonym for --find-copies-harder

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f3e95389aa5914cc05145625a5dd48bafbf086ba..7246e10d3eaae90943608f6df95b7dd2c6d45ebc 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -251,6 +251,7 @@ endif::git-log[]
        If `n` is specified, it has the same meaning as for `-M<n>`.
 
 --find-copies-harder::
        If `n` is specified, it has the same meaning as for `-M<n>`.
 
 --find-copies-harder::

+--detect-copies-harder::

        For performance reasons, by default, `-C` option finds copies only
        if the original file of the copy was modified in the same
        changeset.  This flag makes the command
        For performance reasons, by default, `-C` option finds copies only
        if the original file of the copy was modified in the same
        changeset.  This flag makes the command

diff --git a/diff.c b/diff.c
index c248bc64c57b3206905dd8e6f72a702073a137cc..dee0bd8f4efc9927a8adfe249f97bdcfb1927715 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3194,7 +3194,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
                DIFF_OPT_SET(options, TEXT);
        else if (!strcmp(arg, "-R"))
                DIFF_OPT_SET(options, REVERSE_DIFF);
                DIFF_OPT_SET(options, TEXT);
        else if (!strcmp(arg, "-R"))
                DIFF_OPT_SET(options, REVERSE_DIFF);

-       else if (!strcmp(arg, "--find-copies-harder"))
+       else if (!strcmp(arg, "--find-copies-harder") || !strcmp(arg, "--detect-copies-harder"))

                DIFF_OPT_SET(options, FIND_COPIES_HARDER);
        else if (!strcmp(arg, "--follow"))
                DIFF_OPT_SET(options, FOLLOW_RENAMES);
                DIFF_OPT_SET(options, FIND_COPIES_HARDER);
        else if (!strcmp(arg, "--follow"))
                DIFF_OPT_SET(options, FOLLOW_RENAMES);