From: Junio C Hamano <junkio@cox.net>
Date: Fri, 10 Feb 2006 19:57:08 +0000 (-0800)
Subject: Merge branch 'master'
X-Git-Tag: v1.3.0-rc1~54^2~85
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b82b0082db43f902309787e561613550dd773838;p=git.git

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'
---

b82b0082db43f902309787e561613550dd773838