]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94336d7 fb1b786)
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)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.