On Tue, Jan 20, 2009 at 11:39:59AM -0500, Caleb Cushing wrote: > firstly my patch sucks, and I know it. but hopefully it'll give some > idea of what I'm trying to do and someone can implement it properly. > > basically there are some files, that I can't merge with git, but I > need to merge other files before I can fix those and I like to use > mergetool, so I want a way to skip the files I'm not going to be able > to merge. > For some reason I couldn't see a patch, but I like the idea of this from the description and I was at very early stage of working on something similar myself but it stalled due to other commitments. For the moment the only way to 'skip' files is by passing full paths of what you *don't* want to skip to mergetool which isn't really the same thing at all. -- Charles Bailey http://ccgi.hashpling.plus.com/blog/ -- 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
