]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 968e62c 57246b7)
Merge branch 'mr/merge-file-object-id-worktree-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Mar 2026 18:00:01 +0000 (11:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Mar 2026 18:00:01 +0000 (11:00 -0700)
commit828988bef368456e613a0e0bb5f1ba9580a6b341
treeb73797b92169dd65ad60298d2f53ef97b903a6batree | snapshot
parent968e62c18794535f9b010d3075806f0950aa16bbcommit | diff
parent57246b7c626c18bad5f7a36b9479dea58b73242dcommit | diff
Merge branch 'mr/merge-file-object-id-worktree-fix'

merge-file --object-id used to trigger a BUG when run in a linked
worktree, which has been fixed.

* mr/merge-file-object-id-worktree-fix:
  merge-file: fix BUG when --object-id is used in a worktree
builtin/merge-file.c diff1 | diff2 | blob | history
t/t6403-merge-file.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.