Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx> writes: > git am already accepts a "--reject" switch, which basically means > apply the bits you can, but you can't set it as enabled by default > currently. Does this work correctly with all four combinations of (have/do not have) config, (have/do not have) command line option, when "am" stops in the middle due to conflict and you say "git am --continue" after dealing with the first such conflict? The first choice needs to be remembered and used. -- 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