summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-18 10:51:22 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-18 10:51:22 -0800
commitb7cd0c9b692af7728a1d876a3e4fe760956e00c3 (patch)
tree7e9f11c1d6356dc468d08f41d1ed2fb65d1a161f
parentGit 1.8.1-rc2 (diff)
parentMerge branch 'jk/pickaxe-textconv' into maint (diff)
downloadtgif-b7cd0c9b692af7728a1d876a3e4fe760956e00c3.tar.xz
Sync with 'maint'
-rw-r--r--Documentation/diff-options.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f4f7e250c5..39f2c5074c 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -309,7 +309,11 @@ endif::git-log[]
index (i.e. amount of addition/deletions compared to the
file's size). For example, `-M90%` means git should consider a
delete/add pair to be a rename if more than 90% of the file
- hasn't changed.
+ hasn't changed. Without a `%` sign, the number is to be read as
+ a fraction, with a decimal point before it. I.e., `-M5` becomes
+ 0.5, and is thus the same as `-M50%`. Similarly, `-M05` is
+ the same as `-M5%`. To limit detection to exact renames, use
+ `-M100%`.
-C[<n>]::
--find-copies[=<n>]::