Merge branch 'jk/no-optional-locks'

Doc update for a feature available in Git v2.14 and upwards. * jk/no-optional-locks: git-status.txt: mention --no-optional-locks

Junio C Hamano committed Dec 13, 2017 at 13:28 UTC e6bf6afe27d9a600963e8733ce17e7b067a4701c

No changes.