Re: [GIT PULL] SLAB include file dependency fixes + kmemtrace updates

Linus Torvalds
2009-04-05T20:01:41Z

On Sun, 5 Apr 2009, Ingo Molnar wrote:
>
> ( Please note that i rebased the tree exactly once, shortly after it
> got finished, to make it all bisectable and reviewable: the
> perfect insight shown in the tree now was IMHO not humanly
> possible to achieve in advance.

This is actually the rigth thing to do. Rebasing is not wrong, if it is
done judiciously (and not on already-exposed stuff).

Rebasing is bad if
- you do it so late in the game that all test experience is basically
worthless
- after you've pushed out and other people have seen and depend on that
branch (and you didn't warn them)
- you do it to other peoples git commits, so that their tree (that was
the source of the commit) now has the same commit duplicated as
something else.

I wrote a posting about rebasing to Dave Airlie on dri-devel, that might
be googleable. Hmm. Here:

http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html

so rebase isn't bad, it's often a great way to fix things as you go along.
It just goes with a few basic caveats.

Linus