git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
NKNeal Kreitzinger <nkreitzinger@gmail.com>
Date
Apr 12, 2012, 23:33 UTC
Message-ID
<4F876666.7080501@gmail.com>
In-Reply-To
<CAGAhT3k4Hztbn8139LBuRFxTJgKxDzZcJR=L2A5o9rQBVuVMEw@mail.gmail.com>
On 4/12/2012 3:31 PM, Alexander Kostikov wrote:
Show 13 quoted lines
> 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

Previous: Alexander KostikovNext: Alexander Kostikov
Message 2 of 3 in “How to always use --merge option in git rebase?”
  1. Alexander KostikovApr 12, 2012
  2. Neal KreitzingerApr 12, 2012
  3. Alexander KostikovApr 14, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.