summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-02 15:30:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-02 15:30:43 -0700
commit30bf8d9f4f06d8e35793612c8611cb03c53a73db (patch)
tree194baa306b8fb60956fe05d8a6daa42c6cc0bfb4 /builtin/merge-ours.c
parentMerge branch 'en/t6042-insane-merge-rename-testcases' (diff)
parentfetch-pack: support negotiation tip whitelist (diff)
downloadtgif-30bf8d9f4f06d8e35793612c8611cb03c53a73db.tar.xz
Merge branch 'jt/fetch-nego-tip'
"git fetch" learned a new option "--negotiation-tip" to limit the set of commits it tells the other end as "have", to reduce wasted bandwidth and cycles, which would be helpful when the receiving repository has a lot of refs that have little to do with the history at the remote it is fetching from. * jt/fetch-nego-tip: fetch-pack: support negotiation tip whitelist
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions