From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:08:08 +0000 (-0700)
Subject: Merge branch 'maint-1.7.3' into maint-1.7.4
X-Git-Tag: v1.7.8-rc0~7^2~5^2~3^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ed36a48e6d246f4f60d44b27e8c1e660151cd0b4;p=git.git

Merge branch 'maint-1.7.3' into maint-1.7.4

* maint-1.7.3:
  make the sample pre-commit hook script reject names with newlines, too
  Reindent closing bracket using tab instead of spaces
  Documentation/git-update-index: refer to 'ls-files'
---

ed36a48e6d246f4f60d44b27e8c1e660151cd0b4