Re: [Mesa3d-dev] gallium-resources branch merge

[Keith W. <kei...@go...>]

On Sat, Apr 10, 2010 at 3:49 PM, Roland Scheidegger <sr...@vm...> wrote:
> On 10.04.2010 16:43, Chia-I Wu wrote:
>> On Sat, Apr 10, 2010 at 8:00 PM, Keith Whitwell
>> <kei...@go...> wrote:
>>> Hmm, not sure whether to merge or squash-merge this branch.  Any thoughts?
>> The conversion to pipe_resource seems to be done by components.  Maybe a new
>> branch that reorganize (git rebase -i) the commits in gallium-resources and
>> merge the new branch to master?
>
> I've never used git rebase -i but I'm not convinced that can give
> something sensible. It wasn't done strictly by components, with a couple
> merges from master (and gallium-buffer-usage-cleanup) in between and
> fixes for already converted things...
>

Squash merge it is.

Keith