diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-27 15:09:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-27 15:09:46 -0700 |
| commit | a4adb60583e205230aa71e24ac543ea4822d6162 (patch) | |
| tree | 4f4c9dd501a9c4f2e4509bebe32f9c64b188f4a2 | |
| parent | dc53e7bc20347778cafb80d41bc37ce1a8902d55 (diff) | |
| parent | 3a35d91446223f63d19e377ea47bc91f7ad822c8 (diff) | |
| download | git-a4adb60583e205230aa71e24ac543ea4822d6162.tar.xz | |
Merge branch 'rk/completion-stash'
The command line completion script (in contrib/) learned that "git
stash show" takes the options "git diff" takes.
* rk/completion-stash:
git-completion.bash: stash-show: complete $__git_diff_common_options
git-completion.bash: __git_diff_common_options: add --[no-]patch
| -rw-r--r-- | contrib/completion/git-completion.bash | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0a96ad87e7..83bc64607b 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 " @@ -3021,7 +3020,10 @@ _git_stash () list,--*) __gitcomp "--name-status --oneline --patch-with-stat" ;; - show,--*|branch,--*) + show,--*) + __gitcomp "$__git_diff_common_options" + ;; + branch,--*) ;; branch,*) if [ $cword -eq 3 ]; then |