diff options
| author | Kevin Ballard <kevin@sb.org> | 2010-11-29 23:52:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-30 01:58:27 +0100 |
| commit | 150a5daad0095d06d38eadefdde4703fa3cca3e5 (patch) | |
| tree | 5d4bd3caa8309a67cb7af1851b01eb3b7442d410 | |
| parent | Merge branch 'cb/maint-orphan-merge-noclobber' (diff) | |
| download | git-150a5daad0095d06d38eadefdde4703fa3cca3e5.tar.xz git-150a5daad0095d06d38eadefdde4703fa3cca3e5.zip | |
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>
| -rw-r--r-- | Documentation/diff-options.txt | 1 | ||||
| -rw-r--r-- | diff.c | 2 |
2 files changed, 2 insertions, 1 deletions
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<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 @@ -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); |