Merge branch 'jk/no-optional-locks'
commite6bf6afe27d9a600963e8733ce17e7b067a4701c
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Dec 2017 21:28:58 +0000 (13 13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Dec 2017 21:28:58 +0000 (13 13:28 -0800)
treec63b6908c9070c2f8e6eb23b5a71fa3f9b285020
parent97e1f857fc8c7a9ba2b1179d58cc2b6b68a88437
parent5e83cca0b83b4a915f9ed246c2bcfeeb5a58b86b
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
Documentation/git-status.txt