From 150a5daad0095d06d38eadefdde4703fa3cca3e5 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Mon, 29 Nov 2010 14:52:59 -0800 Subject: [PATCH] diff: add --detect-copies-harder as a synonym for --find-copies-harder Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 1 + diff.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index f3e95389aa..7246e10d3e 100644 --- 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`. --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 diff --git a/diff.c b/diff.c index c248bc64c5..dee0bd8f4e 100644 --- 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); - 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); -- 2.11.4.GIT