Merge branch 'jt/binsearch-with-fanout'
[gitweb.git] / contrib / completion / git-completion.bash
index 35df6ce9ea3f37c36e4df78929758dd1a818712e..88813e91244d820b4aa2c0fb5e60a44db03c3e59 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/.*://
@@ -1922,6 +1922,7 @@ _git_pull ()
        --*)
                __gitcomp "
                        --rebase --no-rebase
+                       --autostash --no-autostash
                        $__git_merge_options
                        $__git_fetch_options
                "