merge(third_party/git): Merge squashed git subtree at v2.23.0
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
commit
7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
13
third_party/git/t/t5100/patch0009
vendored
Normal file
13
third_party/git/t/t5100/patch0009
vendored
Normal file
|
|
@ -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
|
||||
Loading…
Add table
Add a link
Reference in a new issue