diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:31 -0700 |
| commit | 5f232ecfdf2982adf67af5f9b7aaf05da13a155c (patch) | |
| tree | 5bb068e85b86af7b955944fc3be14c956000569b /Documentation/diff-options.txt | |
| parent | b7f61426675722b9841a534b8a850ca7fab5aa56 (diff) | |
| parent | 1cca17dfff488760e74e2af4b0f686b20a02e6e1 (diff) | |
| download | git-5f232ecfdf2982adf67af5f9b7aaf05da13a155c.tar.gz git-5f232ecfdf2982adf67af5f9b7aaf05da13a155c.tar.xz | |
Merge branch 'jc/linkgit-fix'
Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.
* jc/linkgit-fix:
Documentation: fix linkgit references
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 4b0318e2a..3cb301556 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/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. |