[lkml]   [2008]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: [GIT pull] x86 fixes for 2.6.26
On Fri, 16 May 2008, Linus Torvalds wrote:
> On Sat, 17 May 2008, Thomas Gleixner wrote:
> >
> > please pull the latest x86 fixes from:
> >
> > ssh:// x86-fixes-for-linus
> No.
> You have three real commits there.
> And *six* unnecessary merges.

Hmm, I saw that coming :)

> Why do you merge my tree? Is it the x86 tree, or is it the "general
> development tree"?
> If it's the x86 tree, it shouldn't need to merge everythign else all the
> time. Certainly not if it means that moer than half the commits are just
> merges.
> Do nice topic branches, where each branch has a reason for existing. The
> "x86-fixes-for-linus" branch has x86 fixes.

We have topic branches. How should we keep those topic branches up
to date ? By rebasing ?

> 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. All we did is keeping the branches up to
date vs. your tree, which introduces merges whether we want or
not. I'm well aware of the merge commit issue, but I have no real good
idea how to avoid rebasing in order to keep the history intact and
avoid the merge commits at the same time.


 \ /
  Last update: 2008-05-17 01:47    [W:0.270 / U:1.856 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site