so I do the same merge all the time... sorta, I'm not sure rerere would actually work because the file is different each time... I just have to delete it each time. and I want to automate the process. checkout merge rm commmit, problem is commit brings and editor up, I want to commit with the 'auto inserted merge message' that is generated, without seeing the editor, how do I do this? -- Caleb Cushing http://xenoterracide.blogspot.com -- 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