From 31eed2ba9f6c52ac98da7dfa8bad961621dab532 Mon Sep 17 00:00:00 2001 From: Koosha Khajehmoogahi Date: Sat, 4 Apr 2015 03:22:01 +0200 Subject: bash-completion: add support for git-log --merges= and log.merges Helped-by: Eric Sunshine Signed-off-by: Koosha Khajehmoogahi Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fbe597232c..83b2359f71 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. -- cgit v1.2.1