Hey, I'm trying to get git-apply to apply patches, and let me handle the conflicts in a way I'm comfortable with -- by staging the "successful" hunks and leaving conflict markers in the working tree. With the available flags, I seem to only be able to have successful hunks in the index, and rejected ones in patch-like .rej files. Is there a way to accomplish this? If not, does anyone think it's a good idea? -Ori -- 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