From: Neal Kreitzinger <nkreitzinger@gmail.com>
To: Alexander Kostikov <alex.kostikov@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: How to always use --merge option in git rebase?
Date: Thu, 12 Apr 2012 18:33:58 -0500 [thread overview]
Message-ID: <4F876666.7080501@gmail.com> (raw)
In-Reply-To: <CAGAhT3k4Hztbn8139LBuRFxTJgKxDzZcJR=L2A5o9rQBVuVMEw@mail.gmail.com>
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
next prev parent reply other threads:[~2012-04-12 23:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-12 20:31 How to always use --merge option in git rebase? Alexander Kostikov
2012-04-12 23:33 ` Neal Kreitzinger [this message]
2012-04-14 1:05 ` Alexander Kostikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F876666.7080501@gmail.com \
--to=nkreitzinger@gmail.com \
--cc=alex.kostikov@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.