Kubernetes Manifest Studio
Generate Deployment, Service, and Ingress YAML with a drift checklist.
OpenThe interactive rebase commands you need, on one screen.
Update origin so you rebase onto the latest main.
Run git rebase -i and edit the todo list.
Mark each commit pick, reword, squash or drop.
Fix files, git add, continue, or abort to start over.
Your feature branch has fourteen commits, half of them named fix typo, and the reviewer asked for a cleaner history before merging. Interactive rebase is the right tool, but its todo-list syntax is easy to forget between uses.
The sheet starts with the usual sequence: git fetch origin, then git rebase -i origin/main to replay your branch on the latest main. It lists four todo actions: pick keeps a commit, reword keeps it but lets you edit the message, squash folds it into the commit above, and drop removes it. For conflicts it gives the loop of fixing files, git add and git rebase --continue, plus git rebase --abort to return to where you started. It is a fixed reference, so swap origin/main for your real base branch.
Two tips beyond the short list. fixup works like squash but discards the folded commit's message, which saves editing when those messages are noise. And if you commit with git commit --fixup=HASH while working, git rebase -i --autosquash lines those fixups up for you. After rewriting a pushed branch, push with --force-with-lease rather than --force so you do not overwrite a colleague's commits.
The page is static and runs nothing against your repository. Rewording commits is a good moment to apply the Conventional Commits checker, and the reset mode picker covers simpler undo cases.
Keyboard shortcut
Answers for this tool. For site-wide help, open the FAQ hub.
Both fold a commit into the one above it. squash opens an editor so you can combine the messages, while fixup keeps only the earlier message and discards the folded one.
If it is still in progress, git rebase --abort restores the branch. If it already finished, find the pre-rebase commit in git reflog and reset the branch to it.
You can, but it rewrites commits they have built on, and they will need to rebase or reset their copies. On shared branches a merge is usually less disruptive.