diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:26 -0800 |
| commit | 03dfe4e1afd7314f830703d9559504268863cf1f (patch) | |
| tree | bf0abeb7ee62d7ebcbbf2acac9274ed6dcf1a3cf /contrib/persistent-https | |
| parent | 94336d77bcbf4360b67a9454d8bf2e84b3d88ae7 (diff) | |
| parent | fb1b786ebfab18b851ce1fa94d5063daf11f647f (diff) | |
| download | git-03dfe4e1afd7314f830703d9559504268863cf1f.tar.gz git-03dfe4e1afd7314f830703d9559504268863cf1f.zip | |
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
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions