On Mon, Jul 28, 2008 at 02:16:35PM -0700, Junio C Hamano wrote: > The quoted sentence by me in that message was after I explained why "per > hunk theirs" aka "-Xtheirs" was not such a great idea I further went on to > say "by the way, '-s theirs' is even worse and here is why". Your reason was "it keeps your crap in the history". And while I generally am in favor of getting rid of crap and keeping a clean history, I think it is very much dependent on the individual project's preferences. IOW, that history might not contain "crap" but rather now-obsolete changes that are of historical interest. But I do agree that -Xtheirs is crap. ;) -Peff -- 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
