Merge branch 'os/vcbuild'

[thirdparty/git.git] / Documentation / git.txt

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0bb1cfb2396b530b37e0011222c6c120cdb2736c..2f72b10224a0eb70835ff1ff70172fb6019f1462 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -551,8 +551,9 @@ Git Diffs
 
 `GIT_EXTERNAL_DIFF`::
        When the environment variable `GIT_EXTERNAL_DIFF` is set, the
-       program named by it is called, instead of the diff invocation
-       described above.  For a path that is added, removed, or modified,
+       program named by it is called to generate diffs, and Git
+       does not use its builtin diff machinery.
+       For a path that is added, removed, or modified,
        `GIT_EXTERNAL_DIFF` is called with 7 parameters:
 
        path old-file old-hex old-mode new-file new-hex new-mode