diff options
author | Junio C Hamano <junio@kernel.org> | 2010-05-21 14:57:53 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-05-21 14:57:53 +0000 |
commit | cc7636a7aa705986cedababd3173cad477491003 (patch) | |
tree | d5f2c5aeadb840264c0881528637d5c124b615a7 /diff-options.txt | |
parent | e97d5771c3fcb22302e27b6f962375a059cdcb13 (diff) | |
download | git-htmldocs-cc7636a7aa705986cedababd3173cad477491003.tar.gz |
Autogenerated HTML docs for v1.7.1-226-g770c5
Diffstat (limited to 'diff-options.txt')
-rw-r--r-- | diff-options.txt | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/diff-options.txt b/diff-options.txt index 4a968591c..0d89aaaf2 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -127,11 +127,39 @@ any of those replacements occurred. gives the default to color output. Same as `--color=never`. ---color-words[=<regex>]:: - Show colored word diff, i.e., color words which have changed. - By default, words are separated by whitespace. +--word-diff[=<mode>]:: + Show a word diff, using the <mode> to delimit changed words. + By default, words are delimited by whitespace; see + `--word-diff-regex` below. The <mode> defaults to 'plain', and + must be one of: ++ +-- +color:: + Highlight changed words using only colors. Implies `--color`. +plain:: + Show words as `[-removed-]` and `{+added+}`. Makes no + attempts to escape the delimiters if they appear in the input, + so the output may be ambiguous. +porcelain:: + Use a special line-based format intended for script + consumption. Added/removed/unchanged runs are printed in the + usual unified diff format, starting with a `+`/`-`/` ` + character at the beginning of the line and extending to the + end of the line. Newlines in the input are represented by a + tilde `~` on a line of its own. +none:: + Disable word diff again. +-- ++ +Note that despite the name of the first mode, color is used to +highlight the changed parts in all modes if enabled. + +--word-diff-regex=<regex>:: + Use <regex> to decide what a word is, instead of considering + runs of non-whitespace to be a word. Also implies + `--word-diff` unless it was already enabled. + -When a <regex> is specified, every non-overlapping match of the +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 @@ -143,6 +171,10 @@ 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. + +--color-words[=<regex>]:: + Equivalent to `--word-diff=color` plus (if a regex was + specified) `--word-diff-regex=<regex>`. endif::git-format-patch[] --no-renames:: |