Skip to main content

Git for Authors

Chapter 6 (*) Branch Management

Reference a principle, always working on a branch
interactive rebase, total squash and rebuild commits, grafting
relative references, merge commits, etc, seen already in solo chapter
stash, "I’ll just be a minute"
branch rename, prior to public PR
cherry-pick
Rename a branch
don’t rebase through branch points, might lose one
Fancier diff commands to see whole cumulative branch