diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:11 -0700 |
| commit | 091853a1aad7e337ac24a55c466820db41ad1026 (patch) | |
| tree | d32cd7828411b771f3c16cfa01add96beede05a1 | |
| parent | f936c9b39339983a3cc270803fb9bc0d621da553 (diff) | |
| parent | 7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3 (diff) | |
| download | git-091853a1aad7e337ac24a55c466820db41ad1026.tar.gz | |
Merge branch 'nd/list-merge-strategy' into maint
Completion of "git merge -s<strategy>" (in contrib/) did not work
well in non-C locale.
* nd/list-merge-strategy:
completion: fix completing merge strategies on non-C locales
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3683c772c5..88813e9124 100644 --- 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/.*:// |