Merge branch 'maint'

* maint:
builtin-revert.c: release index lock when cherry-picking an empty commit
document config --bool-or-int
t1300: use test_must_fail as appropriate
cleanup: add isascii()
Documentation: fix badly indented paragraphs in "--bisect-all" description

diff --cc Documentation/git-config.txt
Simple merge

diff --cc pretty.c
Simple merge