diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-27 11:00:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-27 11:00:01 -0700 |
| commit | 828988bef368456e613a0e0bb5f1ba9580a6b341 (patch) | |
| tree | b73797b92169dd65ad60298d2f53ef97b903a6ba /Documentation/git-config.adoc | |
| parent | 968e62c18794535f9b010d3075806f0950aa16bb (diff) | |
| parent | 57246b7c626c18bad5f7a36b9479dea58b73242d (diff) | |
| download | git-828988bef368456e613a0e0bb5f1ba9580a6b341.tar.xz | |
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
Diffstat (limited to 'Documentation/git-config.adoc')
0 files changed, 0 insertions, 0 deletions