git

Git rebase without fear: a practical guide

Rebase gives you a clean, readable history. Learn the three situations where you will use it, and the one rule that keeps you safe.