From: Alexander Kostikov <alex.kostikov@gmail.com>
Date: Thu, 12 Apr 2012 20:31:59 GMT
Subject: How to always use --merge option in git rebase?
Message-ID: <CAGAhT3k4Hztbn8139LBuRFxTJgKxDzZcJR=L2A5o9rQBVuVMEw@mail.gmail.com>

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