Merge branch 'jt/format-patch-from-config'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 37888f4e570e7f268bdc3e735c63f7a136774aa3..85bb8b579b92e05cfb20008aea61aac4950e046b 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1136,6 +1136,7 @@ _git_clone ()
                        --depth
                        --single-branch
                        --branch
+                       --recurse-submodules
                        "
                return
                ;;
@@ -2181,6 +2182,7 @@ _git_config ()
                format.attach
                format.cc
                format.coverLetter
+               format.from
                format.headers
                format.numbered
                format.pretty
@@ -2693,7 +2695,7 @@ _git_whatchanged ()
 
 _git_worktree ()
 {
-       local subcommands="add list prune"
+       local subcommands="add list lock prune unlock"
        local subcommand="$(__git_find_on_cmdline "$subcommands")"
        if [ -z "$subcommand" ]; then
                __gitcomp "$subcommands"
@@ -2705,6 +2707,9 @@ _git_worktree ()
                list,--*)
                        __gitcomp "--porcelain"
                        ;;
+               lock,--*)
+                       __gitcomp "--reason"
+                       ;;
                prune,--*)
                        __gitcomp "--dry-run --expire --verbose"
                        ;;