On Sun, Mar 22, 2015 at 2:28 PM, Koosha Khajehmoogahi <koo...@posteo.de> wrote:
> Subject: Update Bash completion script to include git log --merges option
Nice to see a patch covering this oft-overlooked corner of the project.
It's misleading to say that you're updating it to include the --merges
option, which it already knows about. Spell it out explicitly as
--merges=. Also, drop capitalization, mention area you're touching,
followed by colon, followed by short summary:
completion: teach about git-log --merges= and log.merges
> Signed-off-by: Koosha Khajehmoogahi <koo...@posteo.de>
> ---
> diff --git a/contrib/completion/git-completion.bash
> b/contrib/completion/git-completion.bash
> index 731c289..b63bb95 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1406,7 +1406,7 @@ _git_ls_tree ()
> __git_log_common_options="
> --not --all
> --branches --tags --remotes
> - --first-parent --merges --no-merges
> + --first-parent --merges --merges= --no-merges
> --max-count=
> --max-age= --since= --after=
> --min-age= --until= --before=
> @@ -1451,6 +1451,10 @@ _git_log ()
> __gitcomp "long short" "" "${cur##--decorate=}"
> return
> ;;
> + --merges=*)
> + __gitcomp "show hide only" "" "${cur##--merges=}"
> + return
> + ;;
> --*)
> __gitcomp "
> $__git_log_common_options
> @@ -1861,6 +1865,10 @@ _git_config ()
> __gitcomp "$__git_log_date_formats"
> return
> ;;
> + log.merges)
> + __gitcomp "show hide only"
> + return
> + ;;
> sendemail.aliasesfiletype)
> __gitcomp "mutt mailrc pine elm gnus"
> return
> @@ -2150,6 +2158,7 @@ _git_config ()
> interactive.singlekey
> log.date
> log.decorate
> + log.merges
> log.showroot
> mailmap.file
> man.
> --
> 2.3.3.263.g095251d.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
