Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15

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

From: Neal Kreitzinger <hidden>
Date: 2016-06-15 22:53:34

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help