[nicoburns]

If you only rebase feature branches before merging to main/master/trunk then you still get most of the history.