diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-22 02:29:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-22 02:29:45 +0300 |
| commit | 504683162642c0db86c844ea37cad339f928ea9c (patch) | |
| tree | 8f4e299d182bb887caf3c07a8f8fce23b3128011 /diff-merges.c | |
| parent | 597af311a2899bfd6640b9b107622c5795d5f998 (diff) | |
| parent | ecd81dfc79cf12cc21fc0340da8ca8fcc5aa58a7 (diff) | |
Merge branch 'ns/tmp-objdir' into en/remerge-diff
* ns/tmp-objdir:
tmp-objdir: disable ref updates when replacing the primary odb
tmp-objdir: new API for creating temporary writable databases
Diffstat (limited to 'diff-merges.c')
0 files changed, 0 insertions, 0 deletions