@matheusbsbs / matheus-bagliano / commits / 150a5daad0
Fork 0

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>

Kevin Ballard committed Nov 29, 2010 at 14:52 UTC 150a5daad0095d06d38eadefdde4703fa3cca3e5
2 files changed +2 -1
Documentation/diff-options.txt
+1
@@ -251,6 +251,7 @@ endif::git-log[]
251 If `n` is specified, it has the same meaning as for `-M<n>`.
252
253 --find-copies-harder::
254 +--detect-copies-harder::
255 For performance reasons, by default, `-C` option finds copies only
256 if the original file of the copy was modified in the same
257 changeset. This flag makes the command
diff.c
+1 -1
@@ -3194,7 +3194,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
3194 DIFF_OPT_SET(options, TEXT);
3195 else if (!strcmp(arg, "-R"))
3196 DIFF_OPT_SET(options, REVERSE_DIFF);
3197 - else if (!strcmp(arg, "--find-copies-harder"))
3197 + else if (!strcmp(arg, "--find-copies-harder") || !strcmp(arg, "--detect-copies-harder"))
3198 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3199 else if (!strcmp(arg, "--follow"))
3200 DIFF_OPT_SET(options, FOLLOW_RENAMES);