Merge branch 'ks/maint-mailinfo-folded'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a1298c4f9684a014067ba89a74977f48ac3e7bb9..81f70ec6449f3c15f26884040cdfe9e9cad489eb 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -783,6 +783,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
                        --no-ext-diff
                        --no-prefix --src-prefix= --dst-prefix=
                        --inter-hunk-context=
+                       --patience
                        --raw
 "
 
@@ -1391,7 +1392,7 @@ _git_config ()
 
 _git_remote ()
 {
-       local subcommands="add rm show prune update"
+       local subcommands="add rename rm show prune update"
        local subcommand="$(__git_find_subcommand "$subcommands")"
        if [ -z "$subcommand" ]; then
                __gitcomp "$subcommands"
@@ -1399,7 +1400,7 @@ _git_remote ()
        fi
 
        case "$subcommand" in
-       rm|show|prune)
+       rename|rm|show|prune)
                __gitcomp "$(__git_remotes)"
                ;;
        update)