On Fri, 22 Aug 2008, Andi Kleen wrote: > > Especially in Linux kernel land there seem to be quite a few tree > which are frequently rebased, which means that the usual "git pull -u" > usually leads to conflicts even when one hasn't changed anything > at all and just wants the latest state of that tree. What drugs are you on? "git pull" is not "download". It's "download and merge". If you just want download, use "git fetch". You should never _ever_ use "git pull -u", and the docs even tell you so. And if you _really_ haven't changed anything, then "git pull" will never _ever_ generate a conflict, not with -u, not without, not _ever_. So you are really majorly confused about something here. Linus -- 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
