From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Apr 2010 04:31:20 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fab45027e0cdf3ebdade137cb3740604da7bb4bc;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  Documentation: Describe other situations where -z affects git diff
---

fab45027e0cdf3ebdade137cb3740604da7bb4bc