Code

Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 18 Apr 2006 20:52:46 +0000 (13:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 18 Apr 2006 20:52:46 +0000 (13:52 -0700)
commitd3d9681a0fc23a47d48b5df296cd267b0b6055b2
tree7e7413eba9c394cd20d5850804aa3f31dffce35d
parent524765efa550ea43d9f5aeff6b3c12264f664189
parent4baff50551545e2b6825973ec37bcaf03edb95fe
Merge branch 'master' into next

* master:
  GIT 1.3.0
  Add git-annotate(1) and git-blame(1)
  diff --stat: make sure to set recursive.
  git-svnimport symlink support
Makefile