]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 250fe7f 151726d)
Merge branch 'jk/diff-relative-cached-unmerged-more' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:44:56 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:44:56 +0000 (10:44 -0700)
commitd8636bd7448abb516ca137565962a45e69fbe608
tree426f472b873df8f153656ab82303c96bb9e2f898tree | snapshot
parent250fe7f19410a4727d35b49738074248c2348aa6commit | diff
parent151726d3ca54cbd279d527dc048133ead5c8b582commit | diff
Merge branch 'jk/diff-relative-cached-unmerged-more' into next

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 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.