Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes: > Bash completion support gets the list of available strategies with a > grep and sed trick which does not work on non-C locale since the anchor > string is translated and it does not cover custom strategies either. > > Let's do it a better way and make git-merge provide all available > strategies in machine-readable form. > > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> > --- > Another, perhaps better, option is add "git merge --list-strategies". > It requires some code movement, so I'll try with a simpler approach > first. If you run the probing "merge -s help" under C locale, that would just be a one-liner, no ;-) I.e. > - git merge -s help 2>&1 | > + LANG=C LC_ALL=C git merge -s help 2>&1 | Not rejecting the patch, but just wondering.
