mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
Merge branch 'kf/log-shortlog-completion-fix'
"git shortlog" knows "--committer" and "--author" options, which the command line completion (in contrib/) did not handle well, which has been corrected. * kf/log-shortlog-completion-fix: completion: complete some 'git log' options
This commit is contained in:
@@ -2218,7 +2218,7 @@ __git_log_gitk_options="
|
||||
"
|
||||
# Options that go well for log and shortlog (not gitk)
|
||||
__git_log_shortlog_options="
|
||||
--author= --committer= --grep=
|
||||
--author= --grep= --exclude=
|
||||
--all-match --invert-grep
|
||||
"
|
||||
# Options accepted by log and show
|
||||
@@ -2296,6 +2296,7 @@ __git_complete_log_opts ()
|
||||
$__git_log_shortlog_options
|
||||
$__git_log_gitk_options
|
||||
$__git_log_show_options
|
||||
--committer=
|
||||
--root --topo-order --date-order --reverse
|
||||
--follow --full-diff
|
||||
--abbrev-commit --no-abbrev-commit --abbrev=
|
||||
@@ -3229,7 +3230,7 @@ _git_shortlog ()
|
||||
__gitcomp "
|
||||
$__git_log_common_options
|
||||
$__git_log_shortlog_options
|
||||
--numbered --summary --email
|
||||
--committer --numbered --summary --email
|
||||
"
|
||||
return
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user