From: Junio C Hamano <junkio@cox.net>
Date: Thu, 12 Oct 2006 07:46:06 +0000 (-0700)
Subject: Merge branch 'jc/blame' into jc/web-blame
X-Git-Tag: v1.4.4-rc1~69^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66d0ff1bd35530f84c2b73e2b0e367637805217a;p=git.git

Merge branch 'jc/blame' into jc/web-blame

* jc/blame:
  blame: Document and add help text for -f, -n, and -p
  Remove git-annotate.perl and create a builtin-alias for git-blame
---

66d0ff1bd35530f84c2b73e2b0e367637805217a