It’s time to understand the full power of Git’s rebase capabilities while Allen takes a call from Doc Brown, Michael is breaking stuff all day long, and Joe must be punished.
The full show notes for this episode are available at https://www.codingblocks.net/episode193.
git branch
shows the branches in your local repo.git show-branch
shows the branch ancestry in your local repo. T
and F
, where T
= Trunk and F
= Feature and the commit history looks like this:T2
, T3
, and T4
into F3
. F3'
commit is essentially a “meta-commit” because it’s showing the work necessary to bring T4
and F3
together in the repository but contains no new changes from the working tree (assuming there were no merge conflicts to resolve, etc.) git rebase
, but you should only do this for local development.F3'
is an instruction on how to transform F3 + T4
.F1'
is based on T4
as if that’s how it was originally written by the author.rebase
for local branches that don’t have other branches off it, otherwise use merge
for anything else.git rebase
will try to automatically do all the merging.git rebase -i
will allow you to handle every aspect of the rebase process. -i
. The commit should be applied to its rewritDateline NBC
Current and classic episodes, featuring compelling true-crime mysteries, powerful documentaries and in-depth investigations.
Death, Sex & Money
Anna Sale explores the big questions and hard choices that are often left out of polite conversation.
Stuff You Should Know
If you've ever wanted to know about champagne, satanism, the Stonewall Uprising, chaos theory, LSD, El Nino, true crime and Rosa Parks, then look no further. Josh and Chuck have you covered.