]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jk/diff-relative-cached-unmerged' into jk/diff-relative-cached-unmerged...
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Jul 2026 16:17:12 +0000 (09:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Jul 2026 16:17:12 +0000 (09:17 -0700)
commit8d01be9868e08413ea9371ac3a0148fc983f8e1d
treecf02ea7a6d118569d9b66ddf3c313babb6e9565b
parente9019fcafe0040228b8631c30f97ae1adb61bcdc
parent447126ed7df66b396235766547a57649f925aac2
Merge branch 'jk/diff-relative-cached-unmerged' into jk/diff-relative-cached-unmerged-more

* jk/diff-relative-cached-unmerged:
  diff-lib: add idx/tree sanity check to oneway_diff
  diff: ignore unmerged paths outside prefix with --relative --cached