undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/list-merge-strategy'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2018-02-13 13:39:15 -08:00
commit 8df7f75556
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/git-completion.bash
View File

@ -594,7 +594,7 @@ __git_is_configured_remote ()
__git_list_merge_strategies () __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: /,/^$/{ sed -n -e '/[Aa]vailable strategies are: /,/^$/{
s/\.$// s/\.$//
s/.*:// s/.*://