{"thread":{"id":"30227","subject":"How to always use --merge option in git rebase?","startedAt":"2012-04-12T20:31:59Z","lastAt":"2012-04-14T01:05:17Z","messageCount":3,"participants":["Alexander Kostikov","Neal Kreitzinger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"189136","messageId":"CAGAhT3k4Hztbn8139LBuRFxTJgKxDzZcJR=L2A5o9rQBVuVMEw@mail.gmail.com","threadId":"30227","inReplyTo":null,"subject":"How to always use --merge option in git rebase?","fromName":"Alexander Kostikov","fromEmail":"alex.kostikov@gmail.com","sentAt":"2012-04-12T20:31:59Z","receivedAt":"2012-04-12T20:31:59Z","isPatch":false,"sender":{"key":"alex.kostikov@gmail.com","avatar":"https://gravatar.com/avatar/790c4ea9bf7f65be03b0d1c389b5dee8d1e704441d75e690c4372c30f7943e14?d=mp&s=160"},"body":"Hi,\n\nWe have a huge repository ~10 GB. After some integrations the following happens:\n\n> git rebase master\nFirst, rewinding head to replay your work on top of it...\nfatal: Out of memory, malloc failed (tried to allocate 55012353 bytes)\n\nThere is a workaround to use 'git rebase --merge' instead. But I\ncouldn't find a way to make the merge-based rebase the default one. Is\nit possible?\ngit version 1.7.10.msysgit.1\n\n-- \nAlexander Kostikov\n"},{"id":"189162","messageId":"4F876666.7080501@gmail.com","threadId":"30227","inReplyTo":"CAGAhT3k4Hztbn8139LBuRFxTJgKxDzZcJR=L2A5o9rQBVuVMEw@mail.gmail.com","subject":"Re: How to always use --merge option in git rebase?","fromName":"Neal Kreitzinger","fromEmail":"nkreitzinger@gmail.com","sentAt":"2012-04-12T23:33:58Z","receivedAt":"2012-04-12T23:33:58Z","isPatch":false,"sender":{"key":"nkreitzinger@gmail.com","avatar":null},"body":"On 4/12/2012 3:31 PM, Alexander Kostikov wrote:\n> Hi,\n>\n> We have a huge repository ~10 GB. After some integrations the following happens:\n>\n>> git rebase master\n> First, rewinding head to replay your work on top of it...\n> fatal: Out of memory, malloc failed (tried to allocate 55012353 bytes)\n>\n> There is a workaround to use 'git rebase --merge' instead. But I\n> couldn't find a way to make the merge-based rebase the default one. Is\n> it possible?\n> git version 1.7.10.msysgit.1\n>\nYou could make a git alias like \"git rebaser\" that does 'git rebase \n--merge'.\n\nv/r,\nneal\n"},{"id":"189233","messageId":"CAGAhT3nL0d_niOuu-jGziJadF1JH7Ujvq_FKKBo4W=FfueUpsA@mail.gmail.com","threadId":"30227","inReplyTo":"4F876666.7080501@gmail.com","subject":"Re: How to always use --merge option in git rebase?","fromName":"Alexander Kostikov","fromEmail":"alex.kostikov@gmail.com","sentAt":"2012-04-14T01:05:17Z","receivedAt":"2012-04-14T01:05:17Z","isPatch":false,"sender":{"key":"alex.kostikov@gmail.com","avatar":"https://gravatar.com/avatar/790c4ea9bf7f65be03b0d1c389b5dee8d1e704441d75e690c4372c30f7943e14?d=mp&s=160"},"body":"Thanks.\nI was hoping there is some config setting for that though.\n\n\nOn Thu, Apr 12, 2012 at 4:33 PM, Neal Kreitzinger\n<nkreitzinger@gmail.com> wrote:\n> On 4/12/2012 3:31 PM, Alexander Kostikov wrote:\n>>\n>> Hi,\n>>\n>> We have a huge repository ~10 GB. After some integrations the following\n>> happens:\n>>\n>>> git rebase master\n>>\n>> First, rewinding head to replay your work on top of it...\n>> fatal: Out of memory, malloc failed (tried to allocate 55012353 bytes)\n>>\n>> There is a workaround to use 'git rebase --merge' instead. But I\n>> couldn't find a way to make the merge-based rebase the default one. Is\n>> it possible?\n>> git version 1.7.10.msysgit.1\n>>\n> You could make a git alias like \"git rebaser\" that does 'git rebase\n> --merge'.\n>\n> v/r,\n> neal\n\n\n\n-- \nAlexander Kostikov\n"}]}