diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-17 15:27:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 15:27:24 -0700 |
| commit | 198b1f1fbb7b9bb186d3e7bc86f62813bccc396a (patch) | |
| tree | 78a3fb45dce6ca0bf5c13f3446ecc7b91e753036 /diff-options.txt | |
| parent | eda40534055629f4ae708ab5ab19c317d2161e42 (diff) | |
| download | git-htmldocs-198b1f1fbb7b9bb186d3e7bc86f62813bccc396a.tar.gz | |
Autogenerated HTML docs for v2.8.2-534-g1f669
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-options.txt b/diff-options.txt index 4b0318e2a..3cb301556 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -271,7 +271,7 @@ For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character. + 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 +linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings. |