Helped-by: Eric Sunshine <[email protected]>
Signed-off-by: Koosha Khajehmoogahi <[email protected]>
---
contrib/completion/git-completion.bash | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index fbe5972..a75d7f5 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,7 +1451,11 @@ _git_log ()
__gitcomp "long short" "" "${cur##--decorate=}"
return
;;
- --*)
+ --merges=*)
+ __gitcomp "show hide only" "" "${cur##--merges=}"
+ return
+ ;;
+ --*)
__gitcomp "
$__git_log_common_options
$__git_log_shortlog_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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
