On Mon, Jul 28, 2008 at 23:35, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: >> 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". Aaah, ok, now I see where my confusion came from. Thank you for clarifying that. Then remains the question, what to tell those that want '-s theirs' not to keep track of their changes, but to keep a fast-forwardable master? > Heh, I ended up doing the "digging" myself. The quote came from this: > > http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89024 > > and "tried not to sound too negative" there refers to: > > http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89021 > > which _was_ about the "-Xtheirs", not "-s theirs". Understood, it makes sense now. -- Cheers, Sverre Rabbelier -- 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
