Appendix C Quick Reference
Cheat sheets for common tasks
We will describe the process of moving commits on a “topic” branch in a local repository to the master branch of a definitive repository where you have permission to push, and the repository is configured as a remote in your local repository. Eventually, the logic of this procedure will become second nature.
-
git checkout masterPrepare to bring the local master branch up-to-date. -
git pullPull new commits from the definitive repository into the local master branch. -
git checkout topicMove back to the topic branch (which will have a different name). -
git rebase masterMove the branch point of the topic branch to the tip of updated master. Resolve any conflicts which occur during the replay phase of the rebase. -
git checkout masterMove back to the local master branch in preparation for modifying it. -
git merge topicUse a fast-forward merge to bring the topic branch into the master branch. -
git branch -d topicThe topic branch pointer is obsolete as it duplicates the master branch pointer. -
git pushMove new commits on the local master branch to the master branch of the definitive repository.
