Skip to content

Commit d520d98

Browse files
phil-blaingitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent da260f6 commit d520d98

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

contrib/completion/git-completion.bash

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,10 +1763,12 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
17631763
--irreversible-delete --line-prefix --no-stat
17641764
--output= --output-indicator-context=
17651765
--output-indicator-new= --output-indicator-old=
1766+
--ws-error-highlight=
1767+
--pickaxe-all --pickaxe-regex
17661768
"
17671769

17681770
# Options for diff/difftool
1769-
__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
1771+
__git_diff_difftool_options="--cached --staged
17701772
--base --ours --theirs --no-index --merge-base
17711773
--ita-invisible-in-index --ita-visible-in-index
17721774
$__git_diff_common_options"
@@ -2115,7 +2117,6 @@ _git_log ()
21152117
--expand-tabs --expand-tabs= --no-expand-tabs
21162118
$merge
21172119
$__git_diff_common_options
2118-
--pickaxe-all --pickaxe-regex
21192120
"
21202121
return
21212122
;;

0 commit comments

Comments
 (0)