summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorRobert Karszniewicz <avoidr@posteo.de>2020-10-06 22:06:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-10-07 17:54:00 (GMT)
commit8a1bb7ee9ddee1bb32e08d153fbc4f6c6cc2586d (patch)
tree4578844f3c5c69bbf31a5183b893ceff4b6f44b4 /contrib/completion
parentd98273ba77e1ab9ec755576bc86c716a97bf59d7 (diff)
downloadgit-8a1bb7ee9ddee1bb32e08d153fbc4f6c6cc2586d.zip
git-8a1bb7ee9ddee1bb32e08d153fbc4f6c6cc2586d.tar.gz
git-8a1bb7ee9ddee1bb32e08d153fbc4f6c6cc2586d.tar.bz2
git-completion.bash: __git_diff_common_options: add --[no-]patch
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>
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-completion.bash5
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0a96ad8..f363554 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1688,6 +1688,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
--submodule --submodule= --ignore-submodules
--indent-heuristic --no-indent-heuristic
--textconv --no-textconv
+ --patch --no-patch
"
_git_diff ()
@@ -2031,11 +2032,9 @@ _git_log ()
--no-walk --no-walk= --do-walk
--parents --children
--expand-tabs --expand-tabs= --no-expand-tabs
- --patch
$merge
$__git_diff_common_options
--pickaxe-all --pickaxe-regex
- --patch --no-patch
"
return
;;
@@ -2938,7 +2937,7 @@ _git_show ()
;;
--*)
__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
- --oneline --show-signature --patch
+ --oneline --show-signature
--expand-tabs --expand-tabs= --no-expand-tabs
$__git_diff_common_options
"