* How to always use --merge option in git rebase?
@ 2012-04-12 20:31 Alexander Kostikov
2012-04-12 23:33 ` Neal Kreitzinger
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Kostikov @ 2012-04-12 20:31 UTC (permalink / raw)
To: Git List
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: How to always use --merge option in git rebase?
2012-04-12 20:31 How to always use --merge option in git rebase? Alexander Kostikov
@ 2012-04-12 23:33 ` Neal Kreitzinger
2012-04-14 1:05 ` Alexander Kostikov
0 siblings, 1 reply; 3+ messages in thread
From: Neal Kreitzinger @ 2012-04-12 23:33 UTC (permalink / raw)
To: Alexander Kostikov; +Cc: Git List
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: How to always use --merge option in git rebase?
2012-04-12 23:33 ` Neal Kreitzinger
@ 2012-04-14 1:05 ` Alexander Kostikov
0 siblings, 0 replies; 3+ messages in thread
From: Alexander Kostikov @ 2012-04-14 1:05 UTC (permalink / raw)
To: Neal Kreitzinger; +Cc: Git List
Thanks.
I was hoping there is some config setting for that though.
On Thu, Apr 12, 2012 at 4:33 PM, Neal Kreitzinger
<nkreitzinger@gmail.com> wrote:
> 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
--
Alexander Kostikov
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-14 1:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-12 20:31 How to always use --merge option in git rebase? Alexander Kostikov
2012-04-12 23:33 ` Neal Kreitzinger
2012-04-14 1:05 ` Alexander Kostikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).