# How to always use --merge option in git rebase? 3 messages from 2012-04-12 to 2012-04-14. Participants: Alexander Kostikov, Neal Kreitzinger. Thread: https://gitlist.dev/t/30227 ## Alexander Kostikov, 2012-04-12 20:31 Subject: How to always use --merge option in git rebase? Message-ID: URL: https://gitlist.dev/e/CAGAhT3k4Hztbn8139LBuRFxTJgKxDzZcJR%3DL2A5o9rQBVuVMEw%40mail.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 ``` ## Neal Kreitzinger, 2012-04-12 23:33 Subject: Re: How to always use --merge option in git rebase? Message-ID: <4F876666.7080501@gmail.com> URL: https://gitlist.dev/e/4F876666.7080501%40gmail.com In-Reply-To: ``` 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, 2012-04-14 01:05 Subject: Re: How to always use --merge option in git rebase? Message-ID: URL: https://gitlist.dev/e/CAGAhT3nL0d_niOuu-jGziJadF1JH7Ujvq_FKKBo4W%3DFfueUpsA%40mail.gmail.com In-Reply-To: <4F876666.7080501@gmail.com> ``` Thanks. I was hoping there is some config setting for that though. On Thu, Apr 12, 2012 at 4:33 PM, Neal Kreitzinger 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 ```