Merge branch 'pb/doc-external-diff-env'

Doc update.

* pb/doc-external-diff-env:
  git.txt: correct stale 'GIT_EXTERNAL_DIFF' description

diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index e8ed6470fb3a64e2bf713c6a4ed98e9b9e04b4a9..b10ff4caa6c52aefc485fec9e71e19c6121946bf 100644 (file)
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -10,7 +10,8 @@ linkgit:git-diff-tree[1], or
 linkgit:git-diff-files[1]
 with the `-p` option produces patch text.
 You can customize the creation of patch text via the
-`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables.
+`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables
+(see linkgit:git[1]).
 
 What the -p option produces is slightly different from the traditional
 diff format:

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