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
bbff8aaaf2f2342b97882f93c9e30050918621c0
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"]
@@ -554,9 +554,11 @@ diff.autorefreshindex::
554
diff.external::
555
If this config variable is set, diff generation is not
556
performed using the internal diff machinery, but using the
557
- given command. Note: if you want to use an external diff
558
- program only on a subset of your files, you might want to
559
- use linkgit:gitattributes[5] instead.
557
+ given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
558
+ environment variable. The command is called with parameters
559
+ as described under "git Diffs" in linkgit:git[1]. Note: if
560
+ you want to use an external diff program only on a subset of
561
+ your files, you might want to use linkgit:gitattributes[5] instead.
562
563
diff.renameLimit::
564
The number of files to consider when performing the copy/rename
Documentation/git-config.txt
+1
-1
@@ -231,7 +231,7 @@ Given a .git/config like this:
231
232
; Our diff algorithm
233
[diff]
234
- external = "/usr/local/bin/gnu-diff -u"
234
+ external = /usr/local/bin/diff-wrapper
235
renames = true
236
237
; Proxy settings