Git exclude certain commits and the code change and keep the other commits on top

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

Have you looked into an interactive rebase? You can drop commits. — evolutionxbox, Nov 01 '18 at 22:57

score 2 · Accepted Answer · answered Nov 01 '18 at 22:54

2

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.

answered Nov 01 '18 at 22:54

VonC

1,262,500
529
4,410
5,250

Thank you, so I've read the cherry pick method and there isn't a true way of merging ticket 6 and ticket 8,9 together as the base of where ticket 8 was developed is different. – Jessi Nov 02 '18 at 18:56

Git exclude certain commits and the code change and keep the other commits on top

1 Answers1