Git Cheat Sheat

Git is the free and open source distributed version control system that’s responsible for everything GitHub
related that happens locally on your computer. This cheat sheet features the most important and commonly
used Git commands for easy reference.

SETUP

Configuring user information used across all local repositories

Set a name that is identifiable for credit when review version history:
git config –global user.name “[firstname lastname]”

Set an email address that will be associated with each history marker
git config –global user.email “[valid-email]”

Set automatic command line coloring for Git for easy reviewing:
git config –global color.ui auto

This method saves the credentials in plaintext on your PC’s disk. Everyone on your computer can access it, so be careful:
git config –global credential.helper store

 

INIT

Configuring user information, initializing and cloning repositories:
git checkout

switch to another branch and check it out into your working directory:
git init

 

 

 

Show modified files in working directory, ready for your next commit:
git status

Add a file as it looks now to your next commit
git add [file]

Unstage a file while retaining the changes in working directory
git reset [file]

diff of what is changed but not staged
git diff

diff of what is staged but not yet committed
git diff –staged

 

 

 

 

 

BRANCH & MERGE
Isolating work in branches, changing context, and integrating changes
git branch

list your branches. a * will appear next to the currently active branch
git branch [branch-name]

create a new branch at the current commit

git merge [branch]

initialize an existing directory as a Git repository

merge the specified branch’s history into the current one

git clone [url]

git log

retrieve an entire repository from a hosted location via URL

show all commits in the current branch’s history

INSPECT & COMPARE

SHARE & UPDATE

Examining logs, diffs and object information

Retrieving updates from another repository and updating local repos

git log

git remote add [alias] [url]

show the commit history for the currently active branch

add a git URL as an alias

git log branchB..branchA

git fetch [alias]

show the commits on branchA that are not on branchB

fetch down all the branches from that Git remote

git log –follow [file]

git merge [alias]/[branch]

show the commits that changed file, even across renames

merge a remote branch into your current branch to bring it up to date

git diff branchB…branchA

git push [alias] [branch]

show the diff of what is in branchA that is not in branchB

Transmit local branch commits to the remote repository branch

git show [SHA]

git pull

show any object in Git in human-readable format

fetch and merge any commits from the tracking remote branch

TRACKING PATH CHANGES

REWRITE HISTORY

Versioning file removes and path changes

Rewriting branches, updating commits and clearing history

git rm [file]

git rebase [branch]

delete the file from project and stage the removal for commit

apply any commits of current branch ahead of specified one

git mv [existing-path] [new-path]

git reset –hard [commit]

change an existing file path and stage the move

clear staging area, rewrite working tree from specified commit

git log –stat -M

show all commit logs with indication of any paths that moved

TEMPORARY COMMITS
Temporarily store modified, tracked files in order to change branches

IGNORING PATTERNS

git stash

Preventing unintentional staging or commiting of files

Save modified and staged changes

logs/
*.notes
pattern*/

git stash list

Save a file with desired patterns as .gitignore with either direct string
matches or wildcard globs.

git stash pop

git config –global core.excludesfile [file]

git stash drop

system wide ignore pattern for all local repositories

discard the changes from top of stash stack

list stack-order of stashed file changes

write working from top of stash stack