Merge branch 'mf/fix-type-in-config-h'

"git config -h" did not describe the "--type" option correctly. * mf/fix-type-in-config-h: config: correct "--type" option in "git config -h" output