From: Junio C Hamano Date: Mon, 25 Mar 2013 20:44:53 +0000 (-0700) Subject: Merge branch 'jc/color-diff-doc' into maint-1.8.1 X-Git-Tag: v1.8.1.6~26 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/82b955c513e403adaf7b39ea621678bbce6b2ede?ds=inline;hp=-c Merge branch 'jc/color-diff-doc' into maint-1.8.1 The "--color=" argument to the commands in the diff family was described poorly. * jc/color-diff-doc: diff-options: unconfuse description of --color --- 82b955c513e403adaf7b39ea621678bbce6b2ede diff --combined Documentation/diff-options.txt index 39f2c5074c,d33f77a05e..bbfe8f8f35 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@@ -170,13 -170,12 +170,13 @@@ 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. - The value must be `always` (the default for ``), `never`, or `auto`. - The default value is `never`. + `--color` (i.e. without '=') is the same as `--color=always`. + '' can be one of `always`, `never`, or `auto`. ifdef::git-diff[] It can be changed by the `color.ui` and `color.diff` configuration settings. @@@ -309,11 -308,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[]:: --find-copies[=]::