Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a54cc2cef6b8a773863da41b01bc1aaa2ae1f0ce..17929b0809803690d88044bbfe71496bfc2da87e 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1204,7 +1204,7 @@ _git_branch ()
                        --color --no-color --verbose --abbrev= --no-abbrev
                        --track --no-track --contains --no-contains --merged --no-merged
                        --set-upstream-to= --edit-description --list
-                       --unset-upstream --delete --move --remotes
+                       --unset-upstream --delete --move --copy --remotes
                        --column --no-column --sort= --points-at
                        "
                ;;