From: Junio C Hamano <junkio@cox.net>
Date: Mon, 20 Feb 2006 22:25:46 +0000 (-0800)
Subject: Merge branch 'ra/anno' into next
X-Git-Tag: v1.3.0-rc1~54^2~51
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0c82a398ec3302294b0bfe33b653a6e90dcf351b;p=git.git

Merge branch 'ra/anno' into next

* ra/anno:
  Add git-annotate, a tool for assigning blame.
  git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information
  contrib/git-svn: add Makefile, test, and associated ignores
  git-svn: fix several corner-case and rare bugs with 'commit'
  contrib/git-svn.txt: add a note about renamed/copied directory support
  git-svn: change ; to && in addremove()
  git-svn: remove any need for the XML::Simple dependency
  git-svn: Allow for more argument types for commit (from..to)
  git-svn: allow --find-copies-harder and -l<num> to be passed on commit
  git-svn: fix a typo in defining the --no-stop-on-copy option
---

0c82a398ec3302294b0bfe33b653a6e90dcf351b