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/diff-generate-patch.txt | |
| parent | 56b891ead142b4df001e2f917665ad5840a02820 (diff) | |
| parent | 17bae894760b79b7e5a4225e0ffca256d3cc5704 (diff) | |
| download | git-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/diff-generate-patch.txt')
| -rw-r--r-- | Documentation/diff-generate-patch.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index e8ed6470fb..b10ff4caa6 100644 --- 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: |