Hi, while at the git-apply topic... Linus Torvalds wrote: > On Thu, 14 Aug 2008, Linus Torvalds wrote: > > > > There's no way to do an all-or-nothing patch, which is often > > a huge requirement. [...] > > ..or to play games with backup and reject files after-the-fact, of course. What I missed when I first used git-apply (git-am) with some not-so- well-done patches was something like a "simulated merge" (of course, only when you ask for it), i.e. something like a user-friendly --reject behavior: Instead of generating reject files it puts conflict markers into the file. (If no context matches at all, then perhaps just insert them at the lines that the hunk header says.) And then declaring the files as "unmerged", so that you can see it in git status. I've seen two or three people asking on #git for such a feature, so it looked like I am not the only one who misses this. But yet I've had no time to implement such a thing. Or is it even there, hidden? Regards, Stephan -- Stephan Beyer <s-beyer@xxxxxxx>, PGP 0x6EDDD207FCC5040F -- 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
