Move Old Commit to New Branch

Question

I've accidentally started working on a new feature in the middle of another. My repository simply looks like this:

A - B - C - D - E master

But I'm hoping to make it look like this:

A - B - D - E     master
       \
        C         new-feature

It seems like a simple question, but I haven't yet found an answer to it by searching. It seems like cherry-picking is close to what I want, and also maybe some rebasing, but I'm new to Git and some help would be appreciated.

Answer 1

First, to make the new branch:

git branch new-feature C

Next, to fix up master

git checkout master
git rebase -i B

When the editor comes up, delete C from the list. Save and exit.