]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: af8a3bb f034bb1)
Merge branch 'jk/ext-diff-with-relative'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jan 2023 20:07:46 +0000 (12:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jan 2023 20:07:46 +0000 (12:07 -0800)
commit1120c54c12788c232d96702702e719f72e7ece14
treec639799d3b9e8fec8c9157f8a6a788049fbac14ftree
parentaf8a3bb853270aae9dd0277a5f4f2b73fa1086f0commit | diff
parentf034bb1cad862a678030cdf0ae833636f9d7dbcacommit | diff
Merge branch 'jk/ext-diff-with-relative'

"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
diff.c diff1 | diff2 | blob | history
t/t4045-diff-relative.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.