Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Dec 2015 20:45:17 +0000 (12:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Dec 2015 20:45:17 +0000 (12:45 -0800)
* maint:
Documentation/git-update-index: add missing opts to synopsis

Trivial merge