"Nguyen Thai Ngoc Duy" <pclouds@xxxxxxxxx> writes: > On second thought, I don't think the patch's worth it. The code in > git-completion.bash is a hack and I replace it with another the hack. > It won't work for custom merges and git-completion.bash will need to > be synced manually anyway, so maybe this patch will do better: This would be the right thing to do for the 'maint' track. In the longer term, especially if we are to actually make the "custom" thing official, I think teaching "git-merge" to report what are available is the only sensible approach, though. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html