Merge branch 'ew/abbrev' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 17 Mar 2006 22:11:00 +0000 (14:11 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 17 Mar 2006 22:11:00 +0000 (14:11 -0800)
commit35a9f5d91eef7f95a50615e5ec3d36f475878c66
tree81b4fe2b70d9f2735367e8a2e8695802ab2d929c
parentf2cb4004fd5b3ec4b11ad8ee6a374a55e9292732
parentad0cae4cb9364b02b74b17f98f818a8e07372693
Merge branch 'ew/abbrev' into next

* ew/abbrev:
  ls-files: add --abbrev[=<n>] option
  ls-tree: add --abbrev[=<n>] option
  blame: Fix git-blame <directory>
  blame: Nicer output