diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:15 (GMT) |
| commit | 8df7f755569135140bd99bbf57aa354bcc5ac9be (patch) | |
| tree | e09172a6ee6d5cefc860aa461b79523c5e2a1149 /contrib | |
| parent | 417c04c5a926d6c7b2dff22a460ec6dc49147df5 (diff) | |
| parent | 7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3 (diff) | |
| download | git-8df7f755569135140bd99bbf57aa354bcc5ac9be.zip git-8df7f755569135140bd99bbf57aa354bcc5ac9be.tar.gz git-8df7f755569135140bd99bbf57aa354bcc5ac9be.tar.bz2 | |
Merge branch 'nd/list-merge-strategy'
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
Diffstat (limited to 'contrib')
| -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 3683c77..88813e9 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/.*:// |