Git Quick Reference#
Break commit into multiple commits#
git rebase -i main
# Set commit to 'edit', exit, and save.
git reset HEAD~
# Make changes.
git rebase --continue
Update from upstream#
Set remote (one time)
# Show current remotes
git remote -v
# Add remote upstream
git remote add upstream UPSTREAM_REPO
# Verify addition of upstream remote
git remote -v
Update upstream repo
git fetch upstream -p
Rebase branch off main#
# Make sure main is current
git pull main
# Check out branch you want to rebase
git checkout BRANCH
# Rebase branch with respect to `main`
git rebase -i main
Branches#
Checkout branch and set tracking:
git checkout -b $BRANCH --track $REMOTE/$BRANCHCompare current heads:
git diff branch1..branch2Compare with respect to common ancestor:
git diff main...featureCompare commits:
git log branch1..branch2Compare specific file:
git diff main..feature -- FILECompare specific file wih working tree:
git diff main-- FILE
Delete branches#
Local:
git branch -d BRANCHRemote:
git push origin --delete BRANCH
Rename local branch#
git branch -m OLD NEW
Show merged/unmerged branches#
git branch --merged $BRANCH
git branch --no-merged $BRANCH