git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: nicer frontend to get rebased tree?

From
AKAndi Kleen <andi@firstfloor.org>
Date
Aug 22, 2008, 18:27 UTC
Message-ID
<20080822182718.GQ23334@one.firstfloor.org>
In-Reply-To
<alpine.LFD.1.10.0808221053080.3487@nehalem.linux-foundation.org>
On Fri, Aug 22, 2008 at 10:55:35AM -0700, Linus Torvalds wrote:
Show 12 quoted lines
> 
> 
> 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
Previous: Linus TorvaldsNext: Linus Torvalds
Message 3 of 42 in “nicer frontend to get rebased tree?”
  1. Andi KleenAug 22, 2008
  2. Linus TorvaldsAug 22, 2008
  3. Andi KleenAug 22, 2008
  4. Linus TorvaldsAug 22, 2008
  5. Paolo CiarrocchiAug 22, 2008
  6. Linus TorvaldsAug 22, 2008
  7. Björn SteinbrinkAug 22, 2008
  8. Paolo CiarrocchiAug 22, 2008
  9. Linus TorvaldsAug 22, 2008
  10. Junio C HamanoAug 22, 2008
  11. Andi KleenAug 23, 2008
  12. Paolo BonziniAug 23, 2008
  13. Andi KleenAug 23, 2008
  14. Paolo BonziniAug 23, 2008
  15. Linus TorvaldsAug 23, 2008
  16. Andi KleenAug 23, 2008
  17. Linus TorvaldsAug 23, 2008
  18. Ingo MolnarAug 25, 2008
  19. Björn SteinbrinkAug 23, 2008
  20. Linus TorvaldsAug 23, 2008
  21. Björn SteinbrinkAug 23, 2008
  22. Documentating branches (was: nicer frontend to get rebased tree?)Marius Vollmer, Aug 23, 2008
  23. Miklos VajnaAug 23, 2008
  24. Marius VollmerAug 23, 2008
  25. Marius VollmerAug 23, 2008
  26. Avery PennarunAug 22, 2008
  27. Andi KleenAug 22, 2008
  28. Paolo CiarrocchiAug 22, 2008
  29. Jakub NarebskiAug 22, 2008
  30. Andi KleenAug 23, 2008
  31. Paolo CiarrocchiAug 23, 2008
  32. Jakub NarebskiAug 23, 2008
  33. Andi KleenAug 23, 2008
  34. Paolo CiarrocchiAug 23, 2008
  35. Linus TorvaldsAug 23, 2008
  36. Paolo CiarrocchiAug 23, 2008
  37. Björn SteinbrinkAug 23, 2008
  38. Junio C HamanoAug 24, 2008
  39. Jakub NarebskiAug 23, 2008
  40. Theodore TsoAug 23, 2008
  41. A proposed solution (Was: nicer frontend to get rebased tree?)Theodore Tso, Aug 23, 2008
  42. Mikael MagnussonAug 22, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.