tree c63b6908c9070c2f8e6eb23b5a71fa3f9b285020
parent 97e1f857fc8c7a9ba2b1179d58cc2b6b68a88437
parent 5e83cca0b83b4a915f9ed246c2bcfeeb5a58b86b
author Junio C Hamano <gitster@pobox.com> 1513200538 -0800
committer Junio C Hamano <gitster@pobox.com> 1513200538 -0800

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