From: Jeff King <peff@peff.net>
Date: Wed, 25 Nov 2015 00:04:41 +0000 (-0500)
Subject: Merge branch 'maint'
X-Git-Tag: v2.7.0-rc0~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/718a9e67b69d80bee82952dcba5e39198d7d097d?hp=--cc

Merge branch 'maint'

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

718a9e67b69d80bee82952dcba5e39198d7d097d