From: Junio C Hamano Date: Tue, 18 Dec 2012 18:51:22 +0000 (-0800) Subject: Sync with 'maint' X-Git-Tag: v1.8.1-rc3~14 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b7cd0c9b692af7728a1d876a3e4fe760956e00c3?hp=-c Sync with 'maint' --- b7cd0c9b692af7728a1d876a3e4fe760956e00c3 diff --combined Documentation/diff-options.txt index f4f7e250c5,1fb6f2d4e9..39f2c5074c --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@@ -170,8 -170,7 +170,8 @@@ any of those replacements occurred the commits in the range like linkgit:git-submodule[1] `summary` does. Omitting the `--submodule` option or specifying `--submodule=short`, uses the 'short' format. This format just shows the names of the commits - at the beginning and end of the range. + at the beginning and end of the range. Can be tweaked via the + `diff.submodule` configuration variable. --color[=]:: Show colored diff. @@@ -309,7 -308,11 +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[]:: --find-copies[=]::