Merge branch 'maint'
commit718a9e67b69d80bee82952dcba5e39198d7d097d
authorJeff King <peff@peff.net>
Wed, 25 Nov 2015 00:04:41 +0000 (24 19:04 -0500)
committerJeff King <peff@peff.net>
Wed, 25 Nov 2015 00:04:41 +0000 (24 19:04 -0500)
treebc655ee78e54fa5c4359e7f4e98a54231e3ba076
parent0c83680e9c047170614fb08ef222ea4f460e514d
parent5cb2e162d21fa45a63f186b31970e2e9c9b10ba9
Merge branch 'maint'

* maint:
  Documentation/git-update-index: add missing opts to synopsys