Re: Messing with the VC history

[Eli Zaretskii]

> From: David Engster <address@hidden>
> Cc: Achim Gratz <address@hidden>,  address@hidden
> Date: Sun, 16 Nov 2014 17:00:20 +0100
> 
> > 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).

Btw, those who configure Git to rebase on pull might also wish to set
rebase.stat = true, so the diffstat output is still shown when they
pull.