On Fri, Aug 22, 2008 at 10:55:35AM -0700, Linus Torvalds wrote: > > > 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". Well it's in pretty much every tutorial. And none of them said "you have to figure out first if the person maintaining the tree ever uses git rebase or not". I also don't know of any good way to detect this. One has to just guess and try and error. > > If you just want download, use "git fetch". You should never _ever_ use > "git pull -u", and the docs even tell you so. Well git fetch does nothing by itself. Yes I know it can be done (which I figured out after a extended oddysee through git's great documentation), but it's quite complicated and definitely nowhere near intuitive. > And if you _really_ haven't changed anything, then "git pull" will never > _ever_ generate a conflict, not with -u, not without, not _ever_. Sorry that's what I though initially too. But that's wrong. Just clone e.g. linux-next and then try to update it with pull a day later. rebase messed this all up majorly. And people use that unfortunately. In fact most kernel trees except yours seem to do rebase sooner or later. -Andi -- 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
