From: Junio C Hamano <junkio@cox.net>
Date: Thu, 2 Mar 2006 08:02:27 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~54^2~8
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=df45467ec98aa1c532196732c96a62589223353e;p=git.git

Merge branch 'master' into next

* master:
  contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
  Merge branch 'maint'
  read-tree --aggressive: remove deleted entry from the working tree.
  Merge branch 'jc/tag'
  Merge part of 'jc/diff'
---

df45467ec98aa1c532196732c96a62589223353e