From: Junio C Hamano <gitster@pobox.com> Date: Fri, 4 Dec 2015 19:19:11 +0000 (-0800) Subject: Merge branch 'rs/parseopt-short-help' X-Git-Tag: v2.7.0-rc0~15 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2d808073db276a447eb6d7e45afe47a363ff6bbe Merge branch 'rs/parseopt-short-help' Make "-h" command line option work more consistently in all commands. * rs/parseopt-short-help: show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP grep: stop using PARSE_OPT_NO_INTERNAL_HELP parse-options: allow -h as a short option parse-options: inline parse_options_usage() at its only remaining caller parse-options: deduplicate parse_options_usage() calls --- 2d808073db276a447eb6d7e45afe47a363ff6bbe