Re: Messing with the VC history

[Eli Zaretskii]

> 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?