diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-25 17:13:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-25 17:13:29 -0800 |
| commit | 9847a524321afbfa6dbb08bfd9b6a0746f965578 (patch) | |
| tree | 4bceeb48691dab9f86b63b02c7001eb5119716d5 /Documentation/config.txt | |
| parent | d64d4835b83669d5c9c8ce1989859efa803874db (diff) | |
| parent | ae3b970ac3e21324a95fea75213c2569180d74c6 (diff) | |
| download | git-9847a524321afbfa6dbb08bfd9b6a0746f965578.tar.gz git-9847a524321afbfa6dbb08bfd9b6a0746f965578.tar.xz | |
Merge branch 'js/diff-color-words'
* js/diff-color-words:
Change the spelling of "wordregex".
color-words: Support diff.wordregex config option
color-words: make regex configurable via attributes
color-words: expand docs with precise semantics
color-words: enable REG_NEWLINE to help user
color-words: take an optional regular expression describing words
color-words: change algorithm to allow for 0-character word boundaries
color-words: refactor word splitting and use ALLOC_GROW()
Add color_fwrite_lines(), a function coloring each line individually
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 290cb48eb..e2b8775dd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -639,6 +639,12 @@ diff.suppressBlankEmpty:: A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false. +diff.wordRegex:: + A POSIX Extended Regular Expression used to determine what is a "word" + when performing word-by-word difference calculations. Character + sequences that match the regular expression are "words", all other + characters are *ignorable* whitespace. + fetch.unpackLimit:: If the number of objects fetched over the git native transfer is below this |