Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:00 +0000 (16:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:00 +0000 (16:08 -0700)
* sn/doc-update-index-assume-unchanged:
Documentation/git-update-index: refer to 'ls-files'

1  2 
Documentation/git-update-index.txt
Simple merge