]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
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

1  2 
diff-lib.c

diff --cc diff-lib.c
Simple merge