]> git.ipfire.org Git - thirdparty/git.git/commit
git.txt: correct stale 'GIT_EXTERNAL_DIFF' description
authorPhilippe Blain <levraiphilippeblain@gmail.com>
Tue, 1 Sep 2020 13:20:12 +0000 (13:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Sep 2020 19:17:05 +0000 (12:17 -0700)
commit17bae894760b79b7e5a4225e0ffca256d3cc5704
treefd567c8d214b59f3bef28bb418531942867dd1c0
parent47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc
git.txt: correct stale 'GIT_EXTERNAL_DIFF' description

In fde97d8ac6 (Update documentation to remove incorrect GIT_DIFF_OPTS
example., 2006-11-27), the description of the 'GIT_EXTERNAL_DIFF'
variable was moved from 'diff-format.txt' to 'git.txt', and the
documentation was updated to remove a 'diff(1)' invocation since Git did
not use an external diff program anymore by default.

However, the description of 'GIT_EXTERNAL_DIFF' still mentions "instead
of the diff invocation described above", which is confusing.

Correct that outdated sentence.

Also, link to git(1) in 'diff-generate-patch.txt' when GIT_DIFF_OPTS and
GIT_EXTERNAL_DIFF are mentioned, so that users can easily know what
these variables are about.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-generate-patch.txt
Documentation/git.txt