Merge branch 'sp/smart-http-failure-to-push' into next
commitfe0b2aa93660ee05b8e90319e0742a21566e7f60
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 22:06:31 +0000 (23 14:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 22:06:31 +0000 (23 14:06 -0800)
treeeebc6f4b67dc37adfbbc9e2b83fe2c02856acc90
parentdcf1d13028f1135d8e87e2e84b382efd95d7605a
parentc34fe6304c0162c526b74e8639c94d8d026615fd
Merge branch 'sp/smart-http-failure-to-push' into next

* 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