aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorAnders Melchiorsen <mail@cup.kalibalik.dk>2008-07-27 13:12:15 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-01 22:45:27 -0700
commitbbff8aaaf2f2342b97882f93c9e30050918621c0 (patch)
tree34907f6a6e00380262827edb5539c91b32cf3ceb /Documentation
parentb2a56276512885f0c7d159543395769168c9f599 (diff)
downloadgit-bbff8aaaf2f2342b97882f93c9e30050918621c0.tar.gz
git-bbff8aaaf2f2342b97882f93c9e30050918621c0.tar.xz
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt10
-rw-r--r--Documentation/git-config.txt2
2 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5331b450e..d4ca8b271 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -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
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index c90421ee7..b0f20e239 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -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