Re: [GIT pull] x86 fixes for 2.6.26

[Linus Torvalds]

On Sat, 17 May 2008, Thomas Gleixner wrote:
> 
> We have topic branches. How should we keep those topic branches up
> to date ? By rebasing ?

Listen to yourself. They are "topic" branches. They are supposed to do one 
thing. You keep them "uptodate" by doing your work on them, _not_ by 
merging everybody elses work into them.

> > This happens almost every time somebody starts using git properly: at that 
> > point the rebasing no longer hides bad habits.
> 
> We did not rebase at all.

You _used_ to rebase. That hides bad workflows, because it hides the fact 
that your "topic branch" is not a topic branch at all, but something that 
tries to do much more than it's stated purpose.

So now, when you stopped rebasing, the fact that you keep updating your 
topic branches with code that has nothing to do with your topic (ie code 
that I randomly merged from me) is visible as the unnecessary merges.

Yes, doing a merge occasionally just to not fell *too* far behind is sane. 
But when you have twice as many merges as you have real commits, you're 
doing something wrong. At that point, you're no longer a topic branch, 
you're just a mess of other peoples development merged on top of random 
commits you do.

See the difference? You literally merged four times in two days. That's 
not "keeping reasonably up-to-date", that's just messy and OCD.

		Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/