Merge or rebase — how do I choose?

Rebase on your own unshared branch for a clean, linear history. Merge as soon as a branch is shared with others, so you never rewrite history that has already been pushed.

My interactive rebase went wrong — how do I undo it?

`git reflog` lists every recent state of HEAD, including before the rebase; `git reset --hard ` restores the earlier state.

Development

Git branching and advanced rebase

Interactive rebase, cherry-pick and stash: enough to clean up a commit history before sending it for review.

Premium Updated on September 11, 2026

Rebasing a branch onto main

This sheet is for members

Create a free account and read up to 3 premium sheets a month. Or go Premium for unlimited access.

Create a free account See Premium

Already have an account? Log in

#Git #Command line

Rebasing a branch onto main

This sheet is for members

Related sheets