diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:26 -0700 |
| commit | d79e73a833d3c63188e856ddfb43aa3b8129c6a9 (patch) | |
| tree | 9f800a50e063e915fc2426ee72b73897dc71e2bb /builtin/merge-ours.c | |
| parent | Merge branch 'ga/send-email-sendmail-cmd' into maint (diff) | |
| parent | ls-remote: set packet_trace_identity(<name>) (diff) | |
| download | tgif-d79e73a833d3c63188e856ddfb43aa3b8129c6a9.tar.xz | |
Merge branch 'ab/ls-remote-packet-trace' into maint
Debugging aid fix.
* ab/ls-remote-packet-trace:
ls-remote: set packet_trace_identity(<name>)
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions