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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 798b551514a81549d1d9b31b5a8e079e521ba657..1a13abc92223090c563a19074a29b703758d5286 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -92,7 +92,7 @@ Example
 
        # Our diff algorithm
        [diff]
 
        # Our diff algorithm
        [diff]

-               external = "/usr/local/bin/gnu-diff -u"
+               external = /usr/local/bin/diff-wrapper

                renames = true
 
        [branch "devel"]
                renames = true
 
        [branch "devel"]


@@ -563,9 +563,11 @@ diff.autorefreshindex::
 diff.external::
        If this config variable is set, diff generation is not
        performed using the internal diff machinery, but using the
 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.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 697824cbabdd4bab487b8c943277d3a1d703e59a..28e1861094a1689cdb042df6b1d788620ffdf213 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -222,7 +222,7 @@ Given a .git/config like this:
 
        ; Our diff algorithm
        [diff]
 
        ; Our diff algorithm
        [diff]

-               external = "/usr/local/bin/gnu-diff -u"
+               external = /usr/local/bin/diff-wrapper

                renames = true
 
        ; Proxy settings
                renames = true
 
        ; Proxy settings