From: Junio C Hamano <junkio@cox.net>
Date: Tue, 4 Apr 2006 22:00:34 +0000 (-0700)
Subject: Merge branch 'jc/combine' into next
X-Git-Tag: v1.3.0-rc4~43
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=ca3874a47036cd783ceccc0b6f0e588d84b20223;p=git.git

Merge branch 'jc/combine' into next

* jc/combine:
  combine-diff: use built-in xdiff.
  GIT 1.3.0-rc2
  Set HTTP user agent to git/GIT_VERSION
  git-ls-remote: send no-cache header when fetching info/refs
---

ca3874a47036cd783ceccc0b6f0e588d84b20223