Git 排除某些提交和代码更改，并将其他提交放在首位

Question

I have a development branch which serves as a parent (base) for all feature branches. And the commit log looks like below:

ticket9: did something
ticket8: fixed something

ticket7: some action (squashed and rebased commits)
ticket7: some action (squashed and rebased commits)
ticket7: some action (squashed and rebased commits)

ticket6: implemented something

Is there a way where I can take out the commits and the resulting code of ticket7 from the development branch and link ticket 6 and ticket 8 like below?

ticket9: did something
ticket8: fixed something
ticket6: implemented something

Answer 1

If you can, consider doing a:

• git cherry-pick of those "ticket7" commits in a new branch (starting from commit ticket6)
  See " How to cherry pick a range of commits and merge into another branch? ".
• interactive rebase , which will allow you drop those same commit from your current branch

That will involve you force pushing ( git push --force ) the rewritten branch though, meaning you need to warn your colleagues working on that same branch.