提交 bbff8aaa 编写于 作者: A Anders Melchiorsen 提交者: Junio C Hamano

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: NAnders Melchiorsen <mail@cup.kalibalik.dk>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 b2a56276
......@@ -92,7 +92,7 @@ Example
# Our diff algorithm
[diff]
external = "/usr/local/bin/gnu-diff -u"
external = /usr/local/bin/diff-wrapper
renames = true
[branch "devel"]
......@@ -554,9 +554,11 @@ diff.autorefreshindex::
diff.external::
If this config variable is set, diff generation is not
performed using the internal diff machinery, but using the
given command. 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.
given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
environment variable. The command is called with parameters
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::
The number of files to consider when performing the copy/rename
......
......@@ -231,7 +231,7 @@ Given a .git/config like this:
; Our diff algorithm
[diff]
external = "/usr/local/bin/gnu-diff -u"
external = /usr/local/bin/diff-wrapper
renames = true
; Proxy settings
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册