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

Re: Out of memory error with git rebase

From
HKHannu Koivisto <azure@iki.fi>
Date
Oct 31, 2011, 10:33 UTC
Message-ID
<83r51ta1rq.fsf@kalahari.s2.org>
In-Reply-To
<4EA7E710.1020006@kdbg.org>
Johannes Sixt <j6t@kdbg.org> writes:
Show 8 quoted lines
> Am 26.10.2011 11:21, schrieb Hannu Koivisto:
>> If 'git rebase origin/master' dies with an out of memory error
>> (probably due to a few of large binary files in the repository, the
>
> Try 'git rebase -m origin/master'. Without -m, rebase uses
> format-patch+am, i.e., assuming there are changes to the binary files
> that are to be rebased, a binary patch file would have to be generated
> and applied later. This is very likely where git bails out.

Thanks, -m seems to help, even though the large binary files are not touched by the rebased commits (instead, they are touched by the commits on top of which I'm rebasing).

>From the documentation I can't figure out any reason why one

wouldn't always want to use -m. Why is it not the default? I think it's pretty much impossible for ordinary users to figure out that they need -m in a situation like this.

-- 
Hannu
Previous: Johannes SixtNext: Junio C Hamano
Message 3 of 4 in “Out of memory error with git rebase”
  1. Hannu KoivistoOct 26, 2011
  2. Johannes SixtOct 26, 2011
  3. Hannu KoivistoOct 31, 2011
  4. Junio C HamanoOct 31, 2011

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.