Re: [PATCH] pull: Allow pull to preserve merges when rebasing.

From: Philip Oakley <philipoakley@iee.org>
Date: Aug 8, 2013, 21:56 UTC
Message-ID: <7571F7ED549C4BC68F3DE176FBF81F0F@PhilipOakley>
In-Reply-To: <20130808163539.0b59b20a@sh9>

From: "Stephen Haberman" <stephen@exigencecorp.com>

Show 26 quoted lines

> Hi Johannes,
>
>> This should probably be added to config.txt and
>> Documentation/git-pull.txt, too, right?
>
> Yep, I meant to note that I'd do that after getting an initial
> confirmation that the pull.preserve-merges was the preferred approach.
>
> (I was being lazy and didn't want to write up docs only to switch to
> overloading pull.rebase or what not.)
>
> But I'll go ahead and do that.
>
>> https://github.com/msysgit/git/commit/b733454b
>
> Interesting!
>
>> Feel free to play with it if you want!
>
> I'll poke around out of curiosity, but no promises, as, yes, this is a
> tricky bit of functionality that can quickly lead to a lot of lost
> sleep. :-)
>
> - Stephen
>
>

Johannes also kindly explained his merging-rebase script to me on the msysgit list a few days ago https://groups.google.com/forum/?hl=en_US?hl%3Den#!topic/msysgit/LiPa2T_K4C4 which shows how msysgit and git both keep parallel lines of development with fast forwarding and rebasing at the same time.

The technique should also help those case for keeping private/independent lines of development that are discussed often.

Philip