diff options
author | Yann Dirson <ydirson@altern.org> | 2010-11-10 21:27:12 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-10 13:52:05 -0800 |
commit | f611ddc774b58864b1f0b02962c524683a2f6c59 (patch) | |
tree | 67d6715304e8ef8b72b45e14278e7cfab8fe6bad /Documentation | |
parent | diff: add --detect-copies-harder as a synonym for --find-copies-harder (diff) | |
download | tgif-f611ddc774b58864b1f0b02962c524683a2f6c59.tar.xz |
diff: use "find" instead of "detect" as prefix for long forms of -M and -C
It is more consistent with existing --find-copies-harder; luckily "detect"
variant has not appeared in any officially released version of git.
Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/diff-options.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 7246e10d3e..c93124be79 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -230,7 +230,7 @@ eligible for being picked up as a possible source of a rename to another file. -M[<n>]:: ---detect-renames[=<n>]:: +--find-renames[=<n>]:: ifndef::git-log[] Detect renames. endif::git-log[] @@ -246,12 +246,11 @@ endif::git-log[] hasn't changed. -C[<n>]:: ---detect-copies[=<n>]:: +--find-copies[=<n>]:: Detect copies as well as renames. See also `--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 |