]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jk/diff-relative-cached-unmerged-more'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Aug 2026 21:48:00 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Aug 2026 21:48:00 +0000 (14:48 -0700)
commitbabe559ffb0a3ffd8c72641d318091c36e8ef2d5
treee2528423555ad9ee8e53e59baa3cc6d0fbd1513f
parent2c78326f810173a4f3aefd8021f1e07575412481
parent151726d3ca54cbd279d527dc048133ead5c8b582
Merge branch 'jk/diff-relative-cached-unmerged-more'

The code path that deals with relative paths in the 'diff-lib' has
been cleaned up.

* jk/diff-relative-cached-unmerged-more:
  diff-lib: skip paths outside prefix in oneway_diff()
  diff-lib: drop stale comment about advancing o->pos
diff-lib.c