summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-16 12:58:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-16 12:58:59 -0800
commitcf7a64b54afe28ff61b362abc04399de383977e0 (patch)
tree66ef37300dfa1b75c13f43e15df15ac8392afebb /Documentation
parentMerge branch 'jn/fast-import-blob-access' (diff)
parentdiff: use "find" instead of "detect" as prefix for long forms of -M and -C (diff)
downloadtgif-cf7a64b54afe28ff61b362abc04399de383977e0.tar.xz
Merge branch 'kb/diff-C-M-synonym'
* kb/diff-C-M-synonym: diff: use "find" instead of "detect" as prefix for long forms of -M and -C diff: add --detect-copies-harder as a synonym for --find-copies-harder
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f3e95389aa..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,7 +246,7 @@ 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>`.