diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-13 13:28:58 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-13 13:28:58 -0800 |
commit | e6bf6afe27d9a600963e8733ce17e7b067a4701c (patch) | |
tree | c63b6908c9070c2f8e6eb23b5a71fa3f9b285020 /userdiff.c | |
parent | 97e1f857fc8c7a9ba2b1179d58cc2b6b68a88437 (diff) | |
parent | 5e83cca0b83b4a915f9ed246c2bcfeeb5a58b86b (diff) | |
download | git-e6bf6afe27d9a600963e8733ce17e7b067a4701c.tar.gz |
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
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions