Issue #179 consolidate rebase -i and rebase codepaths