mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'pb/doc-external-diff-env'
Doc update. * pb/doc-external-diff-env: git.txt: correct stale 'GIT_EXTERNAL_DIFF' description
This commit is contained in:
commit
cd332b2a31
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue