Merge branch 'maint-1.7.4' into maint-1.7.5
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:14 +0000 (16:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:14 +0000 (16:08 -0700)
commit69d61daec7a7915f6a664f32002fd9403e7f2a34
tree5a82a51e9938eb7154642a5bfc82f84c9e33f44b
parentb586744a864cf4d6886d6436d559302123b01fae
parented36a48e6d246f4f60d44b27e8c1e660151cd0b4
Merge branch 'maint-1.7.4' into maint-1.7.5

* maint-1.7.4:
  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'
Documentation/git-update-index.txt
wt-status.c