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>
Philippe Blain committed
Jun 26, 2023 at 16:24 UTC
d520d98382d3ad7071bc33e2ea2204a4c64ba7bb
1 file changed
+3
-2
contrib/completion/git-completion.bash
+3
-2
@@ -1763,10 +1763,12 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
1763
--irreversible-delete --line-prefix --no-stat
1764
--output= --output-indicator-context=
1765
--output-indicator-new= --output-indicator-old=
1766
+ --ws-error-highlight=
1767
+ --pickaxe-all --pickaxe-regex
1768
"
1769
1770
# Options for diff/difftool
1769
-__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
1771
+__git_diff_difftool_options="--cached --staged
1772
--base --ours --theirs --no-index --merge-base
1773
--ita-invisible-in-index --ita-visible-in-index
1774
$__git_diff_common_options"
@@ -2115,7 +2117,6 @@ _git_log ()
2117
--expand-tabs --expand-tabs= --no-expand-tabs
2118
$merge
2119
$__git_diff_common_options
2118
- --pickaxe-all --pickaxe-regex
2120
"
2121
return
2122
;;