summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-06 07:54:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-06 07:54:14 (GMT)
commita8c44537fe486a156c99f992d8113602d8b57b1f (patch)
tree5d9e30361d6a2261e81f40a7feda66a5be44b6a1 /Documentation
parent2718435b7b746c3c249525b02fbcbad68f5a45f3 (diff)
parent603968d22b19d1b98ff355cc32575a4d9845c151 (diff)
parenta3f583cbf7929f290a47dc0a952ee6b0faa9d279 (diff)
downloadgit-a8c44537fe486a156c99f992d8113602d8b57b1f.zip
git-a8c44537fe486a156c99f992d8113602d8b57b1f.tar.gz
git-a8c44537fe486a156c99f992d8113602d8b57b1f.tar.bz2
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().