summaryrefslogtreecommitdiff
path: root/mergesort.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-03 15:42:48 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-03 15:42:49 +0900
commitd4e93836a6a072e392b20d7daf604fd41e15ecf9 (patch)
tree69f37e3a5a7239b416a0c75b9d52114cb9e048d3 /mergesort.c
parentd9ec072a2903f31a0e1afde4125f62b9fc57f620 (diff)
parent27344d6a6c8056664966e11acf674e5da6dd7ee3 (diff)
downloadgit-d4e93836a6a072e392b20d7daf604fd41e15ecf9.tar.gz
Merge branch 'jk/no-optional-locks'
Some commands (most notably "git status") makes an opportunistic update when performing a read-only operation to help optimize later operations in the same repository. The new "--no-optional-locks" option can be passed to Git to disable them. * jk/no-optional-locks: git: add --no-optional-locks option
Diffstat (limited to 'mergesort.c')
0 files changed, 0 insertions, 0 deletions