CheatSheet.md

Everyday Git Cheat Sheet

Add - Stages Files

git add . - select all

git add . -p - select specific chunks

git add src - directory only

Check what is staged & not staged

git status

Commit

git commit -m "<Verb> <Noun>" - Recommend explicit commit messages, such as

git commit -m "Add unit test for myFunction()"

Push

git push - commits branch to remote

git push --set-upstream origin <branch> - create upstream reference and commits branch to remote

Create new branch

git checkout -b <new-branch>

Stash

git stash - creates a stash of current staged files

git stash list - shows what's stashed

git stash pop - Apply stashed, last in first out

Pulling with Rebase

git pull origin master --rebase - Do this once a day to keep branch up to date on your branch

Fix history of branch last 2 commits

git rebase -i HEAD~2 Useful ones: squash, reword, drop

Go back to a point in time before you messed up rebase

git reflog git reset --hard <SHA OF LAST GOOD COMMIT>

Fixup

git commit --fixup <SHA OF COMMIT TO FIX> git rebase -i --autosquash master