Git: Rebase

Another quick Git video, this time talking about the rebase command and how you can use it to keep a branch current with changes in the parent branch.



By the way, I'm really liking Viddler for hosting these videos, although I need to be a bit more careful about the aspect ratios of the videos I upload to keep the quality up.

The diagrams are done using the presentation mode of OmniGraffle Pro.

[Update: Jacob Farkas pointed out in the comments something that I should have mentioned: rebasing branches that you have already shared with others is a Bad Idea. Don't do it.]