A way to split changes between local and remote branch

[marcinjahn]

Here's a scenario

1. I have some local bookmark with some changes
2. I push the bookmark, it becomes a branch in GitHub
3. I forget to create a new commit and continue working on the same one as before
4. The local bookmark is updated with new changes

Is there some easy way to somehow extract the changes I've done since point 2 to get a new commit with these changes?

[jennings]

See this answer in the FAQ: I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?