git-interactive-rebase

How do I rebase while skipping a particular commit?

September 11, 2023 by Tarik

Use interactive rebase: git rebase -i master An editor will open and you will have a list of commits like this: pick b8f7c25 Fix 1 pick 273b0bb Fix 2 pick 6aaea1b Fix 3 Just delete the commit you want to skip. It will be omitted while rebasing your branch onto master. P.S. If you cannot … Read more

Merge commits don’t appear in git rebase –interactive

July 12, 2023 by Tarik

Rebase doesn’t normally preserve merge commits without –preserve-merges Ok, so I’m not exactly sure what would happen if you tried to squash a merge commit using an interactive rebase with –preserve-merges…but this is how I would remove the merge commit in your case and make your history linear: Rebase everything before the merge commit on … Read more