From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Jul 2026 16:17:12 +0000 (-0700)
Subject: Merge branch 'jk/diff-relative-cached-unmerged' into jk/diff-relative-cached-unmerged... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d01be9868e08413ea9371ac3a0148fc983f8e1d;p=thirdparty%2Fgit.git

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
---

8d01be9868e08413ea9371ac3a0148fc983f8e1d