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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]