From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Jan 2011 22:38:48 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=addf4429eca03df572acca6bdd1be28cd39f4627;p=git.git

Merge branch 'master' into next

* master:
  Documentation: do not treat reset --keep as a special case
  Correctly report corrupted objects
---

addf4429eca03df572acca6bdd1be28cd39f4627