rebase: fast-forward --fork-point in more cases