Git cheats

Basics

git help command: get help for a git command
git init: creates a new git repo, with data stored in the .git directory
git status: tells you what’s going on
git add filename: adds files to staging area
git commit: creates a new commit

Write good commit messages!

Even more reasons to write good commit messages!

git log: shows a flattened log of history
git log --oneline (above but condensed)
git log --all --graph --decorate: visualizes history as a DAG
git diff : show differences since the last commit
git diff : shows differences in a file between snapshots
git checkout : updates HEAD and current branch

Branching and merging

git branch: shows branches
git branch : creates a branch
git checkout -b : creates a branch and switches to it same as git branch ; git checkout
git switch : switches to specified branch
git merge : merges into current branch
git mergetool: use a fancy tool to help resolve merge conflicts
git rebase: rebase set of patches onto a new base

Remotes

git remote: list remotes
git remote add : add a remote
git push :: send objects to remote, and update remote reference
git branch --set-upstream-to=/: set up correspondence between local and remote branch
git fetch: retrieve objects/references from a remote
git pull: same as git fetch; git merge
git clone: download repository from remote

Undo

git commit --amend: edit a commit’s contents/message
git reset HEAD : unstage a file
git checkout -- : discard changes

Advanced Git

git config: Git is highly customizable
git clone --depth=1: shallow clone, without entire version history
git add -p: interactive staging
git rebase -i: interactive rebasing
git blame: show who last edited which line
git stash: temporarily remove modifications to working directory
git stash pop: unstash changes and readd them to staging area
git bisect: binary search history (e.g. for regressions)
.gitignore: specify intentionally untracked files to ignore

Adding files

git add . (adds all modified files to staging)
git add .filetype (add only certain file types - ex. git add.html adds all .html files to staging, works for any file type)

.gitignore

.gitignore will not allow anything included to be staged/commited log.txt - ignore this file name /dir2 - ignore this folder and its entire contents *.txt - ignore all text files