diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-26 23:05:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-26 23:05:48 -0800 |
| commit | 200e96e4af5e604174dff2f1487b26d3c42426f1 (patch) | |
| tree | 928041c5e818de56f2012cf41cb3ef36fa99f809 /mergetools/vim | |
| parent | Merge branch 'fc/push-prune' (diff) | |
| parent | disconnect from remote helpers more gently (diff) | |
| download | tgif-200e96e4af5e604174dff2f1487b26d3c42426f1.tar.xz | |
Merge branch 'sp/smart-http-failure-to-push'
* sp/smart-http-failure-to-push:
: Mask SIGPIPE on the command channel going to a transport helper
disconnect from remote helpers more gently
Conflicts:
transport-helper.c
Diffstat (limited to 'mergetools/vim')
0 files changed, 0 insertions, 0 deletions