]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 265cb7b 57246b7)
Merge branch 'mr/merge-file-object-id-worktree-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2026 21:49:13 +0000 (14:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2026 21:49:13 +0000 (14:49 -0700)
commit68e1ee2045917bb3c6a4585bed36e5138f7278dc
tree68e6728f72995c7b1db0bbcce2027d8e96525016tree | snapshot
parent265cb7b28c801554de6a8e38d8fd5f0c170910c9commit | diff
parent57246b7c626c18bad5f7a36b9479dea58b73242dcommit | diff
Merge branch 'mr/merge-file-object-id-worktree-fix' into next

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.