summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-09-14 10:56:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-14 10:56:05 -0700
commit0057847208f5ccec05a0ea62b239e65f3def3a8c (patch)
tree5ae1f6f3b082560a9f663171c123f5a4b5543ebc /merge-recursive.h
parentThe fifth batch (diff)
parentupload-pack: document and rename --advertise-refs (diff)
downloadtgif-0057847208f5ccec05a0ea62b239e65f3def3a8c.tar.xz
Merge branch 'ab/serve-cleanup' into jk/reduce-malloc-in-v2-servers
* ab/serve-cleanup: upload-pack: document and rename --advertise-refs serve.[ch]: remove "serve_options", split up --advertise-refs code {upload,receive}-pack tests: add --advertise-refs tests serve.c: move version line to advertise_capabilities() serve: move transfer.advertiseSID check into session_id_advertise() serve.[ch]: don't pass "struct strvec *keys" to commands serve: use designated initializers transport: use designated initializers transport: rename "fetch" in transport_vtable to "fetch_refs" serve: mark has_capability() as static
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions