Merge branch 'jc/combine' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 4 Apr 2006 22:00:34 +0000 (15:00 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 4 Apr 2006 22:00:34 +0000 (15:00 -0700)
* 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

Trivial merge