From: Junio C Hamano <junkio@cox.net>
Date: Mon, 6 Feb 2006 07:54:14 +0000 (-0800)
Subject: Merge branches 'jc/daemon' and 'mw/http'
X-Git-Tag: v1.2.0~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8c44537fe486a156c99f992d8113602d8b57b1f;p=git.git

Merge branches 'jc/daemon' and 'mw/http'

* jc/daemon:
  daemon: extend user-relative path notation.
  daemon: Set SO_REUSEADDR on listening sockets.
  daemon: do not forbid user relative paths unconditionally under --base-path

* mw/http:
  http-fetch: Tidy control flow in process_alternate_response
  http: Turn on verbose Curl messages if GIT_CURL_VERBOSE set in environment
  http-fetch: Fix message reporting rename of object file.
  http-fetch: Fix object list corruption in fill_active_slots().
---

a8c44537fe486a156c99f992d8113602d8b57b1f