From: Hannu Koivisto <azure@iki.fi>
Date: Mon, 31 Oct 2011 10:33:45 GMT
Subject: Re: Out of memory error with git rebase
Message-ID: <83r51ta1rq.fsf@kalahari.s2.org>
In-Reply-To: <4EA7E710.1020006@kdbg.org>

Johannes Sixt <j6t@kdbg.org> writes:

> 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