Merge branch 'jk/no-optional-locks'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Dec 2017 21:28:58 +0000 (13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Dec 2017 21:28:58 +0000 (13:28 -0800)
Doc update for a feature available in Git v2.14 and upwards.

* jk/no-optional-locks:
  git-status.txt: mention --no-optional-locks

1  2 
Documentation/git-status.txt

Simple merge