Code

Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 08:02:27 +0000 (00:02 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 08:02:27 +0000 (00:02 -0800)
* 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'


Trivial merge