Merge branch 'maint'
authorJeff King <peff@peff.net>
Wed, 25 Nov 2015 00:04:41 +0000 (19:04 -0500)
committerJeff King <peff@peff.net>
Wed, 25 Nov 2015 00:04:41 +0000 (19:04 -0500)
* maint:
Documentation/git-update-index: add missing opts to synopsys

Trivial merge