From: Junio C Hamano Date: Tue, 18 Apr 2006 20:52:46 +0000 (-0700) Subject: Merge branch 'master' into next X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d3d9681a0fc23a47d48b5df296cd267b0b6055b2;p=git.git 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 --- d3d9681a0fc23a47d48b5df296cd267b0b6055b2