From d520d98382d3ad7071bc33e2ea2204a4c64ba7bb Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Mon, 26 Jun 2023 16:24:45 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 9de33ed05d..5b8e7b810c 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 ;; -- cgit v1.2.3