Git rebase 选择当前分支的提交

Question

I want to clean up my git commit on a branch, named theme , but with my last rebase from master, I messed up on the git commits log (it's out of order). Here's an example of my current situation and what I'm trying to do:

In my theme branch, I have commits ranging from J1-Z1 (hashes)
In my master branch, I have commits from AZ

I want to clean up my theme branch commits so that I have all of master's commit (AZ) along with a group of theme branch commits (lets say M1-Z1) ontop, so it would look like AZ,M1-Z1. That means any other commits before M1 would be discarded.

How would I go about doing this?

Answer 1

I ended up making a new branch from master and cherry-picking the selection of commits from theme branch.