Git Commands Cheatsheet

Reference list of common git commands.

• Glossary
• Help
• Git Config
• Starting a repo
• Tracking and Staging Files
• Git History
• Remotes
• Diffs
• Commits
• Branching
• Aliases

Dynamic Targets

<remote> remote repository name (i.e. Github automatically adds origin remote to your repo)

<address> canonical url for remote repository

<branch> branch name

<message> commit message

<file> path to a file

HEAD refers to the last commit on the current branch you are on

Help

Command	Purpose
git help	will return a list of commands
git help <command>	will return info about that command

Configuration

Command	Purpose
git config --list	list git configurations
git config --global user.name "Tom Chomiak"	globally set your user name
git config --global user.email "[email protected]"	globally set your email
git config --global color.ui true	enable colors in git command line
git config --global core.editor atom	set default editor to atom
git config --global merge.tool opendiff	set merge tool to opendiff

--system flag is used as a system wide setting for all users

--global flag is used as a global setting for your user account

--local flag is used as a local setting for your current local repo

Starting a Repo

Create local git directory

mkdir test
cd test
git init

Tracking and Staging Files

Command	Purpose
git add <file>	add file to staging area for commit
git add <file> <file>	add multiple files to staging area for commit
git add --all	Adds all tracked files that have changed to staging area
git add -p	Interactively add changed hunks
git add *.txt	Adds all text files in current directory
git add app/	Adds all files in app directory
git add app/*.txt	Adds all text files in app directory
git add "*.txt"	Adds all text files in the entire project

Unstaging Files

Command	Purpose
git reset HEAD <file>	Unstage a file
git checkout <file>	reset unstaged file to the state it was in in last commit

Git History

Command	Purpose
git log	list git timeline history
git log --pretty=oneline	display one line history with sha1 at begining
git log --pretty=format:"%h %ad- %s [%an}"	you can format log
git log --oneline -p	show what each commit changed
git log --oneline --stat	show insertions, deletions, additions for commits
git log --oneline --graph	get visual representation of log

Remotes

Command	Purpose
git remote -v	show remove repositories local repo knows about
git remote rm <remote>	remove remote repository
git remote add <remote> <address>	add remote repository
git push -u <remote> <branch>	push to remote and branch name.
git push heroku <branch>:master	push branch to heroku. heroku only deploys master
git remote show <remote>	show status of all remote and local branches
git remote prune <remote>	remove stale branches

Diffs

Command	Purpose
git diff	unstaged differences from last commit
git diff --staged	staged differences from last commit
git diff <branch> <branch>	show differences between two the two branches and the commits they point to
git diff <commit> <commit>	show differences between two commits

Commits

Command	Purpose
git commit -m "<message>"	Make a commit with message
git commit -a -m "<message>"	Add tracked files to stage and commit
git commit --amend -m "<message>"	Amend last commit
git reset --soft HEAD^	Reset last commit into staging
git reset --hard HEAD^	Blow away last commit
git reset --hard HEAD^^	Blow away last two commits

Branching

Command	Purpose
git branch	show current branch along with available local branches
git branch -v	list branches and show commits the branches are pointing to
git branch -r	list all remote branches branch
git branch <branch>	create new feature branch
git checkout <branch>	switch timelines to branch
git checkout -b <branch>	shortcut that creates branch and then checks it out
git checkout master; git merge <branch>	merge branch with master
git push <remote> master <branch>	make local branch a remote branch on master
git push <remote> :<branch>	adding colon deletes remote branch, not the local branch though
git branch -d <branch>	remove local branch (will warn if have uncommited work)
git branch -D <branch>	remove local branch and blow away any uncommited work

Aliases

Command	Purpose
git config --global alias.<name> "<command>"	create alias

Examples:

git config --global alias.lol "log --graph --decorate --pretty=oneline --abbrev-commit --all"

git config --global alias.pom "push origin master"