Merge branch 'sb/status-doc-fix'
[gitweb.git] / contrib / completion / git-completion.bash
index 3683c772c5586ccc1f6dfc8c047919d8d96aa891..c7d5c7af29a8e9595375a535af59549b01da1b49 100644 (file)
@@ -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