From bbff8aaaf2f2342b97882f93c9e30050918621c0 Mon Sep 17 00:00:00 2001 From: Anders Melchiorsen Date: Sun, 27 Jul 2008 13:12:15 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/config.txt | 10 ++++++---- Documentation/git-config.txt | 2 +- 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 -- 2.26.2