From: Neal Kreitzinger <nkreitzinger@gmail.com>
Date: Thu, 12 Apr 2012 23:33:58 GMT
Subject: Re: How to always use --merge option in git rebase?
Message-ID: <4F876666.7080501@gmail.com>
In-Reply-To: <CAGAhT3k4Hztbn8139LBuRFxTJgKxDzZcJR=L2A5o9rQBVuVMEw@mail.gmail.com>

On 4/12/2012 3:31 PM, Alexander Kostikov wrote:
> Hi,
>
> We have a huge repository ~10 GB. After some integrations the following happens:
>
>> git rebase master
> First, rewinding head to replay your work on top of it...
> fatal: Out of memory, malloc failed (tried to allocate 55012353 bytes)
>
> There is a workaround to use 'git rebase --merge' instead. But I
> couldn't find a way to make the merge-based rebase the default one. Is
> it possible?
> git version 1.7.10.msysgit.1
>
You could make a git alias like "git rebaser" that does 'git rebase 
--merge'.

v/r,
neal