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