diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:19 -0700 |
| commit | 483ca933f8fee1e9264aeef71f48f086e7cc70db (patch) | |
| tree | 8c15d0e61a8fbba17034a3f7a4852d48fd42bf1b | |
| parent | Merge branch 'cc/mailmap-tuxfamily' (diff) | |
| parent | completion: add completion for --submodule=* diff option (diff) | |
| download | tgif-483ca933f8fee1e9264aeef71f48f086e7cc70db.tar.xz | |
Merge branch 'jk/completion-diff-submodule'
* jk/completion-diff-submodule:
completion: add completion for --submodule=* diff option
| -rw-r--r-- | contrib/completion/git-completion.bash | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 85bb8b579b..c1b2135544 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 |