Merge branch 'xz/send-email-batch-size'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4ecd0d4d7a5d54925e78e86cc031eacd685c7470..4c86ab66e23ee02e15f15173bc7e613c20347f36 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -594,7 +594,7 @@ __git_is_configured_remote ()
 
 __git_list_merge_strategies ()
 {
-       git merge -s help 2>&1 |
+       LANG=C LC_ALL=C git merge -s help 2>&1 |
        sed -n -e '/[Aa]vailable strategies are: /,/^$/{
                s/\.$//
                s/.*://
@@ -1077,7 +1077,7 @@ _git_am ()
 {
        __git_find_repo_path
        if [ -d "$__git_repo_path"/rebase-apply ]; then
-               __gitcomp "--skip --continue --resolved --abort"
+               __gitcomp "--skip --continue --resolved --abort --quit"
                return
        fi
        case "$cur" in