]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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 patch | diff1 | diff2 | blob | history

diff --cc diff-lib.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.