diff options
| author | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·36+0000 |
|---|---|---|
| committer | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·40+0000 |
| commit | 7ef0d62730840ded097b524104cc0a0904591a63 (patch) | |
| tree | a670f96103667aeca4789a95d94ca0dff550c4ce /third_party/git/t/t5100/patch0009 | |
| parent | 6a2a3007077818e24a3d56fc492ada9206a10cf0 (diff) | |
| parent | 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (diff) | |
merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
Diffstat (limited to 'third_party/git/t/t5100/patch0009')
| -rw-r--r-- | third_party/git/t/t5100/patch0009 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/third_party/git/t/t5100/patch0009 b/third_party/git/t/t5100/patch0009 new file mode 100644 index 000000000000..65615c34af6e --- /dev/null +++ b/third_party/git/t/t5100/patch0009 @@ -0,0 +1,13 @@ +diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt +index b426a14..97756ec 100644 +--- a/Documentation/diff-format.txt ++++ b/Documentation/diff-format.txt +@@ -81,7 +81,7 @@ The "diff" formatting options can be customized via the + environment variable 'GIT_DIFF_OPTS'. For example, if you + prefer context diff: + +- GIT_DIFF_OPTS=-c git-diff-index -p $(cat .git/HEAD) ++ GIT_DIFF_OPTS=-c git-diff-index -p HEAD + + + 2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the |