From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 May 2010 05:39:56 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~134
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=636e87d705c2d6cc53d58eac31b689779d00b292;p=git.git

Merge branch 'maint'

* maint:
  Documentation/gitdiffcore: fix order in pickaxe description
  Documentation: fix minor inconsistency
  Documentation: rebase -i ignores options passed to "git am"
  hash_object: correction for zero length file
---

636e87d705c2d6cc53d58eac31b689779d00b292