Re: Messing with the VC history

[David Engster]

Eli Zaretskii writes:
>> From: Achim Gratz <address@hidden>
>> Date: Sun, 16 Nov 2014 09:19:12 +0100
>> 
>
>> Óscar Fuentes writes:
>> > IMO we should encourage people to use fetch+rebase instead of `pull',
>> > reserving merges for logically-related changes that comprise multiple
>> > commits.
>> 
>> ...or configure Git to have "git pull" do exactly that, at least for the
>> branches that are going upstream.
>
> What about "pull --rebase=preserve"?  It sounds like a less radical
> option, did I miss something?

That option only exists since Git 1.8.5 or so. But I agree that it
should be used if available, as to not accidentally flatten local merges
you want to keep (you can make it default by setting the pull.rebase
option to 'preserve' - again something that really should be the
default).

-David