Merge branch 'maint'

* maint:
t7401: squelch garbage output
Documentation/git-submodule: typofix
Fix config key miscount in url.*.insteadOf
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
Document -w option to shortlog
bisect: report bad rev better

diff --cc git-bisect.sh
Simple merge