Merge branch 'zh/arg-help-format' into maint

Clean up option descriptions in "git cmd --help". * zh/arg-help-format: builtin/*: update usage format parse-options: format argh like error messages