diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2012-11-13 21:12:44 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-12-27 15:21:46 -0800 |
| commit | 0b830ac52137f0f0a8f17e4caee5db7f0dee1ecc (patch) | |
| tree | e3e7e42f6744922c8265f24aa5e8619465544adc | |
| parent | Merge branch 'jc/doc-diff-blobs' into maint (diff) | |
| download | tgif-0b830ac52137f0f0a8f17e4caee5db7f0dee1ecc.tar.xz | |
Documentation: move diff.wordRegex from config.txt to diff-config.txt
19299a8 (Documentation: Move diff.<driver>.* from config.txt to
diff-config.txt, 2011-04-07) moved the diff configuration options to
diff-config.txt, but forgot about diff.wordRegex, which was left
behind in config.txt. Fix this.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 6 | ||||
| -rw-r--r-- | Documentation/diff-config.txt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 11f320b962..d1de85778c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -962,12 +962,6 @@ difftool.<tool>.cmd:: difftool.prompt:: Prompt before each invocation of the diff tool. -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.recurseSubmodules:: This option can be either set to a boolean value or to 'on-demand'. Setting it to a boolean changes the behavior of fetch and pull to diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 67a90a828c..c2b94f9446 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -103,6 +103,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. + diff.<driver>.command:: The custom diff driver command. See linkgit:gitattributes[5] for details. |