diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-09-03 12:37:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-03 12:37:09 -0700 |
| commit | cd332b2a319f00db18b91201cc9a6fafc6adf649 (patch) | |
| tree | b28b4b4f787514d643ace7dd4e879651964361ad /Documentation/git.txt | |
| parent | Merge branch 'jk/xrealloc-avoid-use-after-free' (diff) | |
| parent | git.txt: correct stale 'GIT_EXTERNAL_DIFF' description (diff) | |
| download | tgif-cd332b2a319f00db18b91201cc9a6fafc6adf649.tar.xz | |
Merge branch 'pb/doc-external-diff-env'
Doc update.
* pb/doc-external-diff-env:
git.txt: correct stale 'GIT_EXTERNAL_DIFF' description
Diffstat (limited to 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 0bb1cfb239..2f72b10224 100644 --- 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 |