mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'jk/completion-diff-submodule'
* jk/completion-diff-submodule: completion: add completion for --submodule=* diff option
This commit is contained in:
commit
483ca933f8
|
@ -1205,6 +1205,8 @@ _git_describe ()
|
|||
|
||||
__git_diff_algorithms="myers minimal patience histogram"
|
||||
|
||||
__git_diff_submodule_formats="log short"
|
||||
|
||||
__git_diff_common_options="--stat --numstat --shortstat --summary
|
||||
--patch-with-stat --name-only --name-status --color
|
||||
--no-color --color-words --no-renames --check
|
||||
|
@ -1220,6 +1222,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
|
|||
--dirstat --dirstat= --dirstat-by-file
|
||||
--dirstat-by-file= --cumulative
|
||||
--diff-algorithm=
|
||||
--submodule --submodule=
|
||||
"
|
||||
|
||||
_git_diff ()
|
||||
|
@ -1231,6 +1234,10 @@ _git_diff ()
|
|||
__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
|
||||
return
|
||||
;;
|
||||
--submodule=*)
|
||||
__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
|
||||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
|
||||
--base --ours --theirs --no-index
|
||||
|
@ -1494,6 +1501,14 @@ _git_log ()
|
|||
__gitcomp "full short no" "" "${cur##--decorate=}"
|
||||
return
|
||||
;;
|
||||
--diff-algorithm=*)
|
||||
__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
|
||||
return
|
||||
;;
|
||||
--submodule=*)
|
||||
__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
|
||||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "
|
||||
$__git_log_common_options
|
||||
|
@ -2457,6 +2472,10 @@ _git_show ()
|
|||
__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
|
||||
return
|
||||
;;
|
||||
--submodule=*)
|
||||
__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
|
||||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "--pretty= --format= --abbrev-commit --oneline
|
||||
--show-signature
|
||||
|
|
Loading…
Reference in a new issue