Code

Merge branch 'maint-1.7.3' into maint-1.7.4
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:08 +0000 (16:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:08 +0000 (16:08 -0700)
commited36a48e6d246f4f60d44b27e8c1e660151cd0b4
treee0b4b25edee7aec9592650055c3659a659d1d9ac
parentcdb791f61d71db24fa54363ff6d4b42a46ebbdf1
parenteb4e67288bb9d66fb46092fa30d72c4bdded0c2a
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'
wt-status.c