From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Dec 2017 21:28:58 +0000 (-0800)
Subject: Merge branch 'jk/no-optional-locks'
X-Git-Tag: v2.16.0-rc0~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6bf6afe27d9a600963e8733ce17e7b067a4701c;p=thirdparty%2Fgit.git

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
---

e6bf6afe27d9a600963e8733ce17e7b067a4701c