diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-04 10:36:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-09 15:44:14 -0700 |
| commit | 1cca17dfff488760e74e2af4b0f686b20a02e6e1 (patch) | |
| tree | 698661824352da8f0ecdee4209206cf4a7ceb9d9 /Documentation/diff-options.txt | |
| parent | d92347f59fefb95a2d9240c007a44f408c216fa7 (diff) | |
| download | git-1cca17dfff488760e74e2af4b0f686b20a02e6e1.tar.gz | |
Documentation: fix linkgit referencesjc/linkgit-fix
There are a handful of incorrect "linkgit:<page>[<section>]"
instances in our documentation set.
* Some have an extra colon after "linkgit:"; fix them by removing
the extra colon;
* Some refer to a page outside the Git suite, namely curl(1); fix
them by using the `curl(1)` that already appears on the same page
for the same purpose of referring the readers to its manual page.
* Some spell the name of the page incorrectly, e.g. "rev-list" when
they mean "git-rev-list"; fix them.
* Some list the manual section incorrectly; fix them to make sure
they match what is at the top of the target of the link.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 4b0318e2ac..3cb301556e 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. |