Merge branch 'es/test-cmp-typocatcher'

[thirdparty/git.git] / contrib / completion / git-completion.bash

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ee468ea3b041ca573eb412739443230211cc6043..700d44af5bedb4bdcc6260bad5904e3fe869358c 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1712,8 +1712,8 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
-                       tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
-                       codecompare smerge
+                       tkdiff vimdiff nvimdiff gvimdiff xxdiff araxis p4merge
+                       bc codecompare smerge
 "
 
 _git_difftool ()
@@ -2907,6 +2907,14 @@ _git_show ()
                __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
                return
                ;;
+       --color-moved=*)
+               __gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
+               return
+               ;;
+       --color-moved-ws=*)
+               __gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
+               return
+               ;;
        --*)
                __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
                        --oneline --show-signature --patch