mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
completion: add completion for --submodule=* diff option
Teach git-completion.bash to complete --submodule= for git commands which take diff options. Also teach completion for git-log to support --diff-algorithms as well. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
00f27feb6a
commit
ac76fd54a8
|
@ -1158,6 +1158,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
|
||||
|
@ -1173,6 +1175,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
|
|||
--dirstat --dirstat= --dirstat-by-file
|
||||
--dirstat-by-file= --cumulative
|
||||
--diff-algorithm=
|
||||
--submodule --submodule=
|
||||
"
|
||||
|
||||
_git_diff ()
|
||||
|
@ -1184,6 +1187,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
|
||||
|
@ -1447,6 +1454,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
|
||||
|
@ -2359,6 +2374,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