]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8279ed0) | patch
completion: fix completing merge strategies on non-C locales
authorDuy Nguyen <pclouds@gmail.com>
Fri, 26 Jan 2018 01:31:42 +0000 (08:31 +0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Jan 2018 17:48:14 +0000 (09:48 -0800)
commit7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3
tree039a0822b0da25c87e4432343c89cf4453784126tree | snapshot
parent8279ed033f703d4115bee620dccd32a9ec94d9aacommit | diff
completion: fix completing merge strategies on non-C locales

The anchor string "Available strategies are:" is translatable so
__git_list_merge_strategies may fail to collect available strategies
from 'git merge' on non-C locales. Force C locale on this command.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.