xfs
[Top] [All Lists]

Re: XFS Master Branch Rebase

To: Dave Chinner <david@xxxxxxxxxxxxx>
Subject: Re: XFS Master Branch Rebase
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Wed, 28 Jul 2010 04:44:00 -0400
Cc: Alex Elder <aelder@xxxxxxx>, xfs@xxxxxxxxxxx
In-reply-to: <20100727232719.GR7362@dastard>
References: <1280247366.2002.111.camel@doink> <20100727232719.GR7362@dastard>
User-agent: Mutt/1.5.20 (2009-08-17)
On Wed, Jul 28, 2010 at 09:27:19AM +1000, Dave Chinner wrote:
> Alex, this is a bit annoying. Rebases are a real pain for anyone
> downstream that is using git in non-trivial ways.

FYI: I asked Alex to do it, so I'll happily take all the blaim here.

The real problem is that we had quite a merge mess before, which Linus
absolutely doesn't like.  And if I traced it back correctly most of
it actually came from the xfsdev tree.

<Prev in Thread] Current Thread [Next in Thread>