Documentation: fix diff.external example
The diff.external examples pass a flag to gnu-diff, but GNU diff does not follow the GIT_EXTERNAL_DIFF interface. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
cbb504c974
commit
6bb9e51b8e
@ -92,7 +92,7 @@ Example
|
|||||||
|
|
||||||
# Our diff algorithm
|
# Our diff algorithm
|
||||||
[diff]
|
[diff]
|
||||||
external = "/usr/local/bin/gnu-diff -u"
|
external = /usr/local/bin/diff-wrapper
|
||||||
renames = true
|
renames = true
|
||||||
|
|
||||||
[branch "devel"]
|
[branch "devel"]
|
||||||
@ -563,9 +563,11 @@ diff.autorefreshindex::
|
|||||||
diff.external::
|
diff.external::
|
||||||
If this config variable is set, diff generation is not
|
If this config variable is set, diff generation is not
|
||||||
performed using the internal diff machinery, but using the
|
performed using the internal diff machinery, but using the
|
||||||
given command. Note: if you want to use an external diff
|
given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
|
||||||
program only on a subset of your files, you might want to
|
environment variable. The command is called with parameters
|
||||||
use linkgit:gitattributes[5] instead.
|
as described under "git Diffs" in linkgit:git[1]. Note: if
|
||||||
|
you want to use an external diff program only on a subset of
|
||||||
|
your files, you might want to use linkgit:gitattributes[5] instead.
|
||||||
|
|
||||||
diff.renameLimit::
|
diff.renameLimit::
|
||||||
The number of files to consider when performing the copy/rename
|
The number of files to consider when performing the copy/rename
|
||||||
|
@ -222,7 +222,7 @@ Given a .git/config like this:
|
|||||||
|
|
||||||
; Our diff algorithm
|
; Our diff algorithm
|
||||||
[diff]
|
[diff]
|
||||||
external = "/usr/local/bin/gnu-diff -u"
|
external = /usr/local/bin/diff-wrapper
|
||||||
renames = true
|
renames = true
|
||||||
|
|
||||||
; Proxy settings
|
; Proxy settings
|
||||||
|
Reference in New Issue
Block a user