From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Dec 2008 23:13:02 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a59bb22db24ff90c173ffb462fe67902a213d96;p=git.git

Merge branch 'maint'

* maint:
  GIT 1.6.0.5
  "git diff <tree>{3,}": do not reverse order of arguments
  tag: delete TAG_EDITMSG only on successful tag
  gitweb: Make project specific override for 'grep' feature work
  http.c: use 'git_config_string' to get 'curl_http_proxy'
  fetch-pack: Avoid memcpy() with src==dst
---

3a59bb22db24ff90c173ffb462fe67902a213d96