Merge branch 'maint'

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

Jeff King committed Nov 24, 2015 at 19:04 UTC 718a9e67b69d80bee82952dcba5e39198d7d097d

No changes.