kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

completion: move --pickaxe-{all,regex} to __git_diff_common_options 

The options --pickaxe-all and --pickaxe-regex are listed in
__git_diff_difftool_options and repeated in _git_log. Move them to
__git_diff_common_options instead, which makes them available
automatically in the completion of other commands referencing this
variable.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Philippe Blain 2023-06-26 16:24:45 +00:00 committed by Junio C Hamano
parent da260f6188
commit d520d98382
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/completion/git-completion.bash
View File

@ -1763,10 +1763,12 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
--irreversible-delete --line-prefix --no-stat
--output= --output-indicator-context=
--output-indicator-new= --output-indicator-old=
--ws-error-highlight=
--pickaxe-all --pickaxe-regex
"

# Options for diff/difftool
__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
__git_diff_difftool_options="--cached --staged
--base --ours --theirs --no-index --merge-base
--ita-invisible-in-index --ita-visible-in-index
$__git_diff_common_options"
@ -2115,7 +2117,6 @@ _git_log ()
--expand-tabs --expand-tabs= --no-expand-tabs
$merge
$__git_diff_common_options
--pickaxe-all --pickaxe-regex
"
return
;;