How to always use --merge option in git rebase?

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

-- 
Alexander Kostikov

On 4/12/2012 3:31 PM, Alexander Kostikov wrote:

Hi,

We have a huge repository ~10 GB. After some integrations the following happens:

quoted

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

Thanks.
I was hoping there is some config setting for that though.


On Thu, Apr 12, 2012 at 4:33 PM, Neal Kreitzinger
[off-list ref] wrote:

On 4/12/2012 3:31 PM, Alexander Kostikov wrote:

quoted

Hi,

We have a huge repository ~10 GB. After some integrations the following
happens:

quoted

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

-- 
Alexander Kostikov