summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-07 02:32:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-07 02:32:55 (GMT)
commit37ab7cb0a8e12d7f6e8e994cab48bc2383e03105 (patch)
tree16b6f141cc188d69c8bec9e9d9c163b1ee0d0315 /contrib
parente392382f95fe8d3c15cf88453acb92a93fc5a942 (diff)
parentd49dffde9a3964dce2412ea912b712df212e7046 (diff)
downloadgit-37ab7cb0a8e12d7f6e8e994cab48bc2383e03105.zip
git-37ab7cb0a8e12d7f6e8e994cab48bc2383e03105.tar.gz
git-37ab7cb0a8e12d7f6e8e994cab48bc2383e03105.tar.bz2
Merge branch 'mr/complete-more-for-log-etc'
Completion updates. * mr/complete-more-for-log-etc: completion: add missing completions for log, diff, show
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash18
1 files changed, 14 insertions, 4 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 388f4dd..00fbe6c 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1486,6 +1486,8 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
--dirstat-by-file= --cumulative
--diff-algorithm=
--submodule --submodule= --ignore-submodules
+ --indent-heuristic --no-indent-heuristic
+ --textconv --no-textconv
"
_git_diff ()
@@ -1794,6 +1796,10 @@ _git_log ()
__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
return
;;
+ --no-walk=*)
+ __gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
+ return
+ ;;
--*)
__gitcomp "
$__git_log_common_options
@@ -1801,16 +1807,19 @@ _git_log ()
$__git_log_gitk_options
--root --topo-order --date-order --reverse
--follow --full-diff
- --abbrev-commit --abbrev=
+ --abbrev-commit --no-abbrev-commit --abbrev=
--relative-date --date=
--pretty= --format= --oneline
--show-signature
--cherry-mark
--cherry-pick
--graph
- --decorate --decorate=
+ --decorate --decorate= --no-decorate
--walk-reflogs
+ --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
@@ -2683,8 +2692,9 @@ _git_show ()
return
;;
--*)
- __gitcomp "--pretty= --format= --abbrev-commit --oneline
- --show-signature
+ __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
+ --oneline --show-signature --patch
+ --expand-tabs --expand-tabs= --no-expand-tabs
$__git_diff_common_options
"
return