Git Cheat Sheet
May 13, 2019, 275 words# show branches
git branch
# create a new branch and switch to it
# same as `git branch <name>; git checkout <name>`
git checkout -b <name>
In Git, there are two main ways to integrate changes from one branch into another: the merge and the rebase.
Merge: Join two or more development histories together. Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch
# Assuming the git history looks like this, currently on branch `master`
# A---B---C feature
# /
# D---E---F---G master
git merge feature
# replay the changes made on the `feature` branch since it diverged
# from `master` (i.e., E) until its current commit (C) on top of `master`,
# and record the result in a new commit along with the names of the two parent commits
# A---B---C feature
# / \
# D---E---F---G---H master
Rebase: Take all the changes that were committed on one branch and replay them on a different branch
# Assuming the git history looks like this
# A---B---C feature
# /
# D---E---F---G master
git rebase master feature
# the `feature` branch is transplanted onto the `master` branch
# note that all commits in `feature` branch has been regenerated accordingly
# A'--B'--C' feature
# /
# D---E---F---G master