diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-26 06:36:02 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-26 06:36:02 +0000 |
| commit | 20d47e3f1442b9a7384b08ea40846c078f227a47 (patch) | |
| tree | 0e2eafa5965e7d5044b5b7d3c6e5e16430b4865f /diff-options.txt | |
| parent | 22bcc112adfbdb908fb26cbdb2a89b0db95652a4 (diff) | |
| download | git-htmldocs-20d47e3f1442b9a7384b08ea40846c078f227a47.tar.gz | |
Autogenerated HTML docs for v1.6.1.1-223-gc30e5
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/diff-options.txt b/diff-options.txt index 1f8ce979b..813a7b11b 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -36,7 +36,7 @@ endif::git-format-patch[] --patch-with-raw:: Synonym for "-p --raw". ---patience: +--patience:: Generate a diff using the "patience diff" algorithm. --stat[=width[,name-width]]:: @@ -94,8 +94,22 @@ endif::git-format-patch[] Turn off colored diff, even when the configuration file gives the default to color output. ---color-words:: - 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. ++ +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. ++ +The regex can also be set via a diff driver or configuration option, see +linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly +overrides any diff driver or configuration setting. Diff drivers +override configuration settings. --no-renames:: Turn off rename detection, even when the configuration |