mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 21:07:52 +01:00
Code Activity

git-completion.bash: __git_diff_common_options: add --[no-]patch

Browse source 
At the same time also deduplicate those options from command completions
which use $__git_diff_common_options.

Signed-off-by: Robert Karszniewicz <avoidr@posteo.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Robert Karszniewicz 2020-10-07 00:06:36 +02:00 committed by Junio C Hamano
parent d98273ba77
commit 8a1bb7ee9d
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1688,6 +1688,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
--submodule --submodule= --ignore-submodules --submodule --submodule= --ignore-submodules
--indent-heuristic --no-indent-heuristic --indent-heuristic --no-indent-heuristic
--textconv --no-textconv --textconv --no-textconv
--patch --no-patch
" "
_git_diff () _git_diff ()
@ -2031,11 +2032,9 @@ _git_log ()
--no-walk --no-walk= --do-walk --no-walk --no-walk= --do-walk
--parents --children --parents --children
--expand-tabs --expand-tabs= --no-expand-tabs --expand-tabs --expand-tabs= --no-expand-tabs
--patch
$merge $merge
$__git_diff_common_options $__git_diff_common_options
--pickaxe-all --pickaxe-regex --pickaxe-all --pickaxe-regex
--patch --no-patch
" "
return return
;; ;;
@ -2938,7 +2937,7 @@ _git_show ()
;; ;;
--*) --*)
__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
--oneline --show-signature --patch --oneline --show-signature
--expand-tabs --expand-tabs= --no-expand-tabs --expand-tabs --expand-tabs= --no-expand-tabs
$__git_diff_common_options $__git_diff_common_options
" "