Rebase without merges

Same as #1936, but without the merges.