Skip to main content

rebase ↔ to rewrite Commit History to simplify/linearize Merge

git rebase master​

to combine Branch into Master by modifying Master

git rebase master --interactive​

to control rebase Master Branch via interactive doc editor to pick & squash Commits

pick​

(default) to keep Commit

squash​

to combine multi Commits into single name Commit

fixup​

variant of squash but omit msg

git rebase -i --autosquash​

to rebase & auto squash every Commit

image

References​

  1. git rebase master --interactive ↔ to control rebase Master Branch via interactive doc editor to pick & squash Commits

  2. git rebase -i --autosquash ↔ to rebase & auto squash every Commit