kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Kevin Ballard 2010-11-29 14:52:59 -08:00 committed by Junio C Hamano
parent 7d43de925b
commit 150a5daad0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/diff-options.txt
View File

@ -251,6 +251,7 @@ endif::git-log[]
If `n` is specified, it has the same meaning as for `-M<n>`. If `n` is specified, it has the same meaning as for `-M<n>`.


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

2
diff.c
View File

@ -3194,7 +3194,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
DIFF_OPT_SET(options, TEXT); DIFF_OPT_SET(options, TEXT);
else if (!strcmp(arg, "-R")) else if (!strcmp(arg, "-R"))
DIFF_OPT_SET(options, REVERSE_DIFF); 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); DIFF_OPT_SET(options, FIND_COPIES_HARDER);
else if (!strcmp(arg, "--follow")) else if (!strcmp(arg, "--follow"))
DIFF_OPT_SET(options, FOLLOW_RENAMES); DIFF_OPT_SET(options, FOLLOW_RENAMES);