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>
Anders Melchiorsen committed
Jul 27, 2008 at 13:12 UTC
6bb9e51b8ef2f397f9f44cfaeaa120ca0cc741e6
2 files changed
+7
-5
Documentation/config.txt
+6
-4
@@ -92,7 +92,7 @@ Example
92
93
# Our diff algorithm
94
[diff]
95
- external = "/usr/local/bin/gnu-diff -u"
95
+ external = /usr/local/bin/diff-wrapper
96
renames = true
97
98
[branch "devel"]
@@ -563,9 +563,11 @@ diff.autorefreshindex::
563
diff.external::
564
If this config variable is set, diff generation is not
565
performed using the internal diff machinery, but using the
566
- given command. Note: if you want to use an external diff
567
- program only on a subset of your files, you might want to
568
- use linkgit:gitattributes[5] instead.
566
+ given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
567
+ environment variable. The command is called with parameters
568
+ as described under "git Diffs" in linkgit:git[1]. Note: if
569
+ you want to use an external diff program only on a subset of
570
+ your files, you might want to use linkgit:gitattributes[5] instead.
571
572
diff.renameLimit::
573
The number of files to consider when performing the copy/rename
Documentation/git-config.txt
+1
-1
@@ -222,7 +222,7 @@ Given a .git/config like this:
222
223
; Our diff algorithm
224
[diff]
225
- external = "/usr/local/bin/gnu-diff -u"
225
+ external = /usr/local/bin/diff-wrapper
226
renames = true
227
228
; Proxy settings