Introduction to Git - Branching and Merging. Twitter: @davidmahler LinkedIn: https://www.linkedin.com/in/davidmahler Introduction to Git - Core Concepts (recommended prerequisite): https://www.youtube.com/watch?v=uR6G2v_WsRA Reference: https://git-scm.com/book/en/v2 Commands Used: git log = git history git log --all --decorate --oneline --graph = commit history graph git branch (branch-name) = create a branch git checkout (branch-name) = checkout a branch/move head pointer git commit -a -m "commit message" = commit all modified and tracked files in on command (bypass separate 'git add' command) git diff master..SDN = diff between 2 branches git merge (branch-name) = merge branches (fast-forward and 3-way merges) git branch --merged = see branches merged into the current branch git branch -d (branch-name) = delete a branch, only if already merged git branch -D (branch-name) = delete a branch, including if not already merged (exercise caution here) git merge --abort = abort a merge during a merge conflict situation git checkout (commit-hash) = checkout a commit directly, not through a branch, results in a detached HEAD state git stash = create a stash point git stash list = list stash points git stash list -p = list stash points and show diffs per stash git stash apply = apply most recent stash git stash pop = apply most recent stash, and remove it from saved stashes git stash apply (stash reference) = apply a specific stash point git stash save "(description)" = create a stash point, be more descriptive