]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'sb/merge-ours-sparse'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Feb 2026 21:39:26 +0000 (13:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Feb 2026 21:39:26 +0000 (13:39 -0800)
commit03dfe4e1afd7314f830703d9559504268863cf1f
treebf0abeb7ee62d7ebcbbf2acac9274ed6dcf1a3cf
parent94336d77bcbf4360b67a9454d8bf2e84b3d88ae7
parentfb1b786ebfab18b851ce1fa94d5063daf11f647f
Merge branch 'sb/merge-ours-sparse'

"git merge-ours" is taught to work better in a sparse checkout.

* sb/merge-ours-sparse:
  merge-ours: integrate with sparse-index
  merge-ours: drop USE_THE_REPOSITORY_VARIABLE