Merge branch 'jc/blame' into jc/web-blame
commit66d0ff1bd35530f84c2b73e2b0e367637805217a
authorJunio C Hamano <junkio@cox.net>
Thu, 12 Oct 2006 07:46:06 +0000 (12 00:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 12 Oct 2006 07:46:06 +0000 (12 00:46 -0700)
tree6a32fc84dffe46a587b12e3d3b69436f5ede8a72
parentd15c55aa052434aee75c73da4ed771af3e3b6f61
parentb24642b2f27b2cf01f6e726d816a2a1f5955ae3e
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
Makefile