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)
* master:
  GIT 1.3.0
  Add git-annotate(1) and git-blame(1)
  diff --stat: make sure to set recursive.
  git-svnimport symlink support

1  2 
Makefile

diff --cc Makefile
Simple merge