projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8bbb42a 7cc763a)
Merge branch 'nd/list-merge-strategy' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Feb 2018 22:56:00 +0000 (14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Feb 2018 22:56:00 +0000 (14:56 -0800)
commita75d04a67532d21f43261716b4671b7095fa7535
treee09172a6ee6d5cefc860aa461b79523c5e2a1149tree | snapshot
parent8bbb42ad3c8e3b8bc666ad3b6d86df83cecceda1commit | diff
parent7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3commit | diff
Merge branch 'nd/list-merge-strategy' into next

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
Unnamed repository; edit this file 'description' to name the repository.