Merge branch 'maint-1.7.5' into maint-1.7.6
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:19 +0000 (16:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:19 +0000 (16:08 -0700)
commita574c04fbfa06d9b40c4c32db27135c503da7c15
tree13b9ee7c195f9aa80433e504d8fb8d569e26c5d9
parent632052641517de1a965c1f045b97d2eaa541b2e9
parent69d61daec7a7915f6a664f32002fd9403e7f2a34
Merge branch 'maint-1.7.5' into maint-1.7.6

* maint-1.7.5:
  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'
wt-status.c