diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-09-18 17:58:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-18 17:58:01 -0700 |
| commit | 711f5b3ce208071e711c40938eb5a676efa6f82b (patch) | |
| tree | 6dca6f100b4e706b28ecbbec949bbc3aa7ae8e84 /merge.c | |
| parent | Merge branch 'ea/blame-use-oideq' (diff) | |
| parent | refs: move REF_LOG_ONLY to refs-internal.h (diff) | |
| download | tgif-711f5b3ce208071e711c40938eb5a676efa6f82b.tar.xz | |
Merge branch 'hn/refs-ref-log-only-bit'
A bit of API reshuffling to make sure stuff common to all backends
are not defined only in files backend.
* hn/refs-ref-log-only-bit:
refs: move REF_LOG_ONLY to refs-internal.h
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions