Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes: > - Make the -3 and -c switches in git am configuration variables. I > have an alias. - Make failed "git am --3way" due to "unusable index" a bit more helpful. Right now, the information on which hunk failed to apply is lost, and there is no "git am --no-3way" (the user needs to know the trick ">.git/rebase-apply/threeway"). -- 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