DEV Community

Cover image for GIT CHEATSHEET
Danish Saleem
Danish Saleem

Posted on • Originally published at buymeacoffee.com

GIT CHEATSHEET

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

git config --global user.name "[firstname lastname]"
set a name that is identifiable for credit when review version history
Enter fullscreen mode Exit fullscreen mode
git config --global user.email "[valid-email]"
set an email address that will be associated with each history marker
Enter fullscreen mode Exit fullscreen mode
git config --global color.ui auto
set automatic command line coloring for Git for easy reviewing
Enter fullscreen mode Exit fullscreen mode

SETUP & INIT

Configuring user information, initializing and cloning repositories

git init
initialize an existing directory as a Git repository
Enter fullscreen mode Exit fullscreen mode
git clone [url]
retrieve an entire repository from a hosted location via URL
Enter fullscreen mode Exit fullscreen mode

STAGE & SNAPSHOT

Working with snapshots and the Git staging area

git status
show modified files in working directory, staged for your next commit
Enter fullscreen mode Exit fullscreen mode
git add [file]
add a file as it looks now to your next commit (stage
Enter fullscreen mode Exit fullscreen mode
git reset [file]
unstage a file while retaining the changes in working directory
Enter fullscreen mode Exit fullscreen mode
git diff
diff of what is changed but not staged
Enter fullscreen mode Exit fullscreen mode
git diff --staged
diff of what is staged but not yet commited
Enter fullscreen mode Exit fullscreen mode
git commit -m “[descriptive message]”
commit your staged content as a new commit snapshot
Enter fullscreen mode Exit fullscreen mode

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
Enter fullscreen mode Exit fullscreen mode
git branch [branch-name]
create a new branch at the current commit
Enter fullscreen mode Exit fullscreen mode
git checkout
switch to another branch and check it out into your working directory
Enter fullscreen mode Exit fullscreen mode
git merge [branch]
merge the specified branch’s history into the current one
Enter fullscreen mode Exit fullscreen mode
git log
show all commits in the current branch’s history
Enter fullscreen mode Exit fullscreen mode

INSPECT & COMPARE

Examining logs, diffs and object information

git log
show the commit history for the currently active branch
Enter fullscreen mode Exit fullscreen mode
git log branchB..branchA
show the commits on branchA that are not on branchB
Enter fullscreen mode Exit fullscreen mode
git log --follow [file]
show the commits that changed file, even across renames
Enter fullscreen mode Exit fullscreen mode
git diff branchB...branchA
show the diff of what is in branchA that is not in branchB
Enter fullscreen mode Exit fullscreen mode
git show [SHA]
show any object in Git in human-readable format
Enter fullscreen mode Exit fullscreen mode

TRACKING PATH CHANGES

Versioning file removes and path changes

git rm [file]
delete the file from project and stage the removal for commit
Enter fullscreen mode Exit fullscreen mode
git mv [existing-path] [new-path]
change an existing file path and stage the move
Enter fullscreen mode Exit fullscreen mode
git log --stat -M
show all commit logs with indication of any paths that moved
Enter fullscreen mode Exit fullscreen mode

IGNORING PATTERNS

Preventing unintentional staging or commiting of files

logs/
*.notes
pattern*/
Save a file with desired paterns as .gitignore with either direct string
matches or wildcard globs.
Enter fullscreen mode Exit fullscreen mode
git config --global core.excludesfile [file]
system wide ignore patern for all local repositories
Enter fullscreen mode Exit fullscreen mode

SHARE & UPDATE

Retrieving updates from another repository and updating local repos

git remote add [alias] [url]
add a git URL as an alias
Enter fullscreen mode Exit fullscreen mode
git fetch [alias]
fetch down all the branches from that Git remote
Enter fullscreen mode Exit fullscreen mode
git merge [alias]/[branch]
merge a remote branch into your current branch to bring it up to date
Enter fullscreen mode Exit fullscreen mode
git push [alias] [branch]
Transmit local branch commits to the remote repository branch
Enter fullscreen mode Exit fullscreen mode
git pull
fetch and merge any commits from the tracking remote branch
Enter fullscreen mode Exit fullscreen mode

REWRITE HISTORY

Rewriting branches, updating commits and clearing history

git rebase [branch]
apply any commits of current branch ahead of specified one
Enter fullscreen mode Exit fullscreen mode
git reset --hard [commit]
clear staging area, rewrite working tree from specified commit
Enter fullscreen mode Exit fullscreen mode

TEMPORARY COMMITS

Temporarily store modified, tracked files in order to change branches

git stash
Save modified and staged changes
Enter fullscreen mode Exit fullscreen mode
git stash list
list stack-order of stashed file changes
Enter fullscreen mode Exit fullscreen mode
git stash pop
write working from top of stash stack
Enter fullscreen mode Exit fullscreen mode
git stash drop
discard the changes from top of stash stack
Enter fullscreen mode Exit fullscreen mode

Let's connect!

You can follow me on Twitter, LinkedIn & GitHub


If you like this post. Kindly support me by Buying Me a Coffee

Buy Me a Coffee

Discussion (6)

Collapse
markfusion profile image
Mark Vassilevskiy

Hey! I've found your article very useful and would like to offer you cooperation. We've over 50k per week and also, we're building Projects/Startups in different directions. You can add me at Discord: MarkFusion#2903

Collapse
marwenshili profile image
Shili Mrawen

super thanks

Collapse
daniel0liver profile image
Daniel Oliveira

Thanks for this post, very helpful ;D

you could write another post talking about git tag, pleaseeeeeee!!!

Collapse
mrdanishsaleem profile image
Danish Saleem Author

Okay sure I'll write about git tag

Collapse
miladtehrany profile image
Milad Tehrany

Very useful, thanks

Collapse
shamolmojumder profile image
Shamol Mojumder

Very helpful