]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
* jk/diff-relative-cached-unmerged:
  diff-lib: add idx/tree sanity check to oneway_diff
  diff: ignore unmerged paths outside prefix with --relative --cached


Trivial merge