diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-24 15:32:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-24 15:32:40 -0700 |
| commit | 066f6cd44707ca2f8c3dc2a2ae02c2c9784903bf (patch) | |
| tree | c999b2444dfcb545f683ce39e6d8d70beae882ea /merge.c | |
| parent | Merge branch 'es/trace2-log-parent-process-name' (diff) | |
| parent | fetch: die on invalid --negotiation-tip hash (diff) | |
| download | tgif-066f6cd44707ca2f8c3dc2a2ae02c2c9784903bf.tar.xz | |
Merge branch 'jt/push-negotiation-fixes'
Bugfix for common ancestor negotiation recently introduced in "git
push" code path.
* jt/push-negotiation-fixes:
fetch: die on invalid --negotiation-tip hash
send-pack: fix push nego. when remote has refs
send-pack: fix push.negotiate with remote helper
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions