diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-04 22:16:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-04 22:16:33 -0800 |
| commit | a4d7615453eff93838d496db6b533b327c8cadfc (patch) | |
| tree | 397bc90b0b6b648161640cda81c0d83603ab2037 /mergetools/tortoisemerge | |
| parent | Merge branch 'tr/maint-bundle-long-subject' into maint (diff) | |
| parent | disconnect from remote helpers more gently (diff) | |
| download | tgif-a4d7615453eff93838d496db6b533b327c8cadfc.tar.xz | |
Merge branch 'sp/smart-http-failure-to-push' into maint
* 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/tortoisemerge')
0 files changed, 0 insertions, 0 deletions