Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx> --- Documentation/diff-options.txt | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 2c1fa4b..8689a92 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -91,12 +91,17 @@ endif::git-format-patch[] Turn off colored diff, even when the configuration file gives the default to color output. ---color-words[=regex]:: - Show colored word diff, i.e. color words which have changed. +--color-words[=<regex>]:: + Show colored word diff, i.e., color words which have changed. + By default, words are separated by whitespace. + -Optionally, you can pass a regular expression that tells Git what the -words are that you are looking for; The default is to interpret any -stretch of non-whitespace as a word. +When a <regex> is specified, every non-overlapping match of the +<regex> is considered a word. Anything between these matches is +considered whitespace and ignored(!) for the purposes of finding +differences. You may want to append `|[^[:space:]]` to your regular +expression to make sure that it matches all non-whitespace characters. +A match that contains a newline is silently truncated(!) at the +newline. --no-renames:: Turn off rename detection, even when the configuration -- 1.6.1.315.g92577 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
