Merge branch 'sp/smart-http-failure-to-push' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 06:16:33 +0000 (22:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 06:16:33 +0000 (22:16 -0800)
commita4d7615453eff93838d496db6b533b327c8cadfc
tree397bc90b0b6b648161640cda81c0d83603ab2037
parent26f1e9bd68b6eb32d1376ae392354551c5ae17bc
parentc34fe6304c0162c526b74e8639c94d8d026615fd
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
transport-helper.c