Skip to content

Commit 37ab7cb

Browse files
committed
Merge branch 'mr/complete-more-for-log-etc'
Completion updates. * mr/complete-more-for-log-etc: completion: add missing completions for log, diff, show
2 parents e392382 + d49dffd commit 37ab7cb

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

contrib/completion/git-completion.bash

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,6 +1486,8 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
14861486
--dirstat-by-file= --cumulative
14871487
--diff-algorithm=
14881488
--submodule --submodule= --ignore-submodules
1489+
--indent-heuristic --no-indent-heuristic
1490+
--textconv --no-textconv
14891491
"
14901492

14911493
_git_diff ()
@@ -1794,23 +1796,30 @@ _git_log ()
17941796
__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
17951797
return
17961798
;;
1799+
--no-walk=*)
1800+
__gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
1801+
return
1802+
;;
17971803
--*)
17981804
__gitcomp "
17991805
$__git_log_common_options
18001806
$__git_log_shortlog_options
18011807
$__git_log_gitk_options
18021808
--root --topo-order --date-order --reverse
18031809
--follow --full-diff
1804-
--abbrev-commit --abbrev=
1810+
--abbrev-commit --no-abbrev-commit --abbrev=
18051811
--relative-date --date=
18061812
--pretty= --format= --oneline
18071813
--show-signature
18081814
--cherry-mark
18091815
--cherry-pick
18101816
--graph
1811-
--decorate --decorate=
1817+
--decorate --decorate= --no-decorate
18121818
--walk-reflogs
1819+
--no-walk --no-walk= --do-walk
18131820
--parents --children
1821+
--expand-tabs --expand-tabs= --no-expand-tabs
1822+
--patch
18141823
$merge
18151824
$__git_diff_common_options
18161825
--pickaxe-all --pickaxe-regex
@@ -2683,8 +2692,9 @@ _git_show ()
26832692
return
26842693
;;
26852694
--*)
2686-
__gitcomp "--pretty= --format= --abbrev-commit --oneline
2687-
--show-signature
2695+
__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
2696+
--oneline --show-signature --patch
2697+
--expand-tabs --expand-tabs= --no-expand-tabs
26882698
$__git_diff_common_options
26892699
"
26902700
return

0 commit comments

Comments
 (0)