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)
* 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'

1  2 
wt-status.c

diff --cc wt-status.c
Simple merge