Merge branch 'et/add-chmod-x'

"git update-index --add --chmod=+x file" may be usable as an escape hatch, but not a friendly thing to force for people who do need to use it regularly. "git add --chmod=+x file" can be used instead. * et/add-chmod-x: add: add --chmod=+x / --chmod=-x options

Junio C Hamano committed Jun 27, 2016 at 09:56 UTC c49fd57bf472143b1a0bbfb246c91e6ea0f06887

No changes.