diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:51 -0800 |
| commit | f8382a639667aedb08afa95339d494d5ed6b370f (patch) | |
| tree | 98fa6a7b6db99d9d4ccdf13f32e05cd7362a9438 /contrib/persistent-https/proxy.go | |
| parent | 7cbfd0e572560040df3381efb91e3b52b524e128 (diff) | |
| parent | f034bb1cad862a678030cdf0ae833636f9d7dbca (diff) | |
| download | git-f8382a639667aedb08afa95339d494d5ed6b370f.tar.gz git-f8382a639667aedb08afa95339d494d5ed6b370f.zip | |
Merge branch 'jk/ext-diff-with-relative' into maint-2.39
"git diff --relative" did not mix well with "git diff --ext-diff",
which has been corrected.
* jk/ext-diff-with-relative:
diff: drop "name" parameter from prepare_temp_file()
diff: clean up external-diff argv setup
diff: use filespec path to set up tempfiles for ext-diff
Diffstat (limited to 'contrib/persistent-https/proxy.go')
0 files changed, 0 insertions, 0 deletions