Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 19:57:08 +0000 (11:57 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 19:57:08 +0000 (11:57 -0800)
commitb82b0082db43f902309787e561613550dd773838
treee2d7d09b2a83153fd26c7c4acd4f7d027a1d1691
parentf732d0b8576303403db2b1824cfd8b5a2fe632ef
parent9da5c2f0d7e99eca46ce12bfe08755b30f2bdd30
Merge branch 'master'

* master:
  rev-list: default to abbreviate merge parent names under --pretty.
  delta micro optimization
  count-delta.c: comment fixes
  Merge branch 'jc/empty-commit'