Git Cheatsheet

GIT DIFF

git diff HEAD
Show difference between working directory and last commit.
git diff --cached
Show difference between staged changes and last commit
git diff --staged
diff of what is staged but not yet committed
git diff branchB ... branchA
Show the diff of what is in branchA that is not in branchB.

Examining diffs

GIT SHOW

git show [SHA]
show any object in Git in human-readable format

Examining object information

GIT RESET

git reset
Reset staging area to match most recent commit, but leave the working directory unchanged.
git reset --hard
Reset staging area and working directory to match most recent commit and overwrites all changes in the working directory.
git reset [commit]
Move the current branch tip backward to commit, reset the staging area to match, but leave the working directory alone.
git reset --hard [commit]
Same as previous, but resets both the staging area & working directory to match. Deletes uncommitted changes, and all commits after commit.

TEMPORARY COMMITS

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

Temporarily store modified, tracked files in order to change branches

GIT REBASE

git rebase -i [base]
Interactively rebase current branch onto nase. Launches editor to enter commands for how each commit will be transferred to the new base.

GIT CONFIG

git config --global user.name “[firstname lastname]”
set a name that is identifiable for credit when review version history
git config --global user.email “[valid-email]”
set an email address that will be associated with each history marker
git config --global color.ui auto
set automatic command line coloring for Git for easy reviewing
git config --global alias. [alias-name] [git-command]
Create shortcut for a Git command. E.g. alias.glog “log --graph --oneline” will set "git glog" equivalent to ”git log --graph--oneline.
git config --system core.editor [editor]
Set text editor used by commands for all users on the machine. editor arg should be the command that launches the desired editor (e.g., vi).
git config --global --edit
Open the global configuration file in a text editor for manual editing.

GIT LOG

git log -[limit]
Limit number of commits by limit. E.g. "git log -5" will limit to 5 commits.
git log --oneline
Condense each commit to a single line.
git log -p
Display the full diff of each commit.
git log --stat
Include which files were altered and the relative number of lines that were added or deleted from each of them.
git log --author= "[pattern]"
Search for commits by a particular author.
git log --grep="[pattern]"
Search for commits with a commit message that matches pattern.
git log [since]..[until]
Show commits that occur between since and until. Args can be a commit ID, branch name, HEAD, or any other kind of revision reference.
git log -- [file]
Only display commits that have the specified file.
git log --graph --decorate
--graph flag draws a text based graph of commits on left side of commit msgs. --decorate adds names of branches or tags of commits shown.
git log branchB..branchA
show the commits on branchA that are not on branchB
git log --follow [file]
show the commits that changed file, even across renames

Examining logs

GIT PULL

git pull
Fetch and merge any commits from the tracking remote branch.
git pull [remote]
Fetch the specified remote's copy of current branch and immediately merge it into the local copy.
git pull --rebase [remote]
Fetch the remote's copy of current branch and rebases it into the local copy. Uses git rebase instead of merge to integrate the branches.

Fetch and download content from a remote repository and immediately update the local repository to match that content.

GIT PUSH

git push [remote] [branch]
Push the branch to remote, along with necessary commits and objects. Creates named branch in the remote repo if it doesn't exist.
git push [remote] --force
Forces the git push even if it results in a non-fast-forward merge. Do not use the --force flag unless you're absolutely sure you know what you're doing.
git push [remote] --all
Push all of your local branches to the specified remote.
git push [remote] --tags
Tags aren't automatically pushed when you push a branch or use the --all flag. The --tags flag sends all of your local tags to the remote repo.

Upload local repository content to a remote repository.

INSTALLATION & GUIS

With platform specific installers for Git, GitHub also provides the ease of staying up-to-date with the latest releases of the command line tool while providing a graphical user interface for day-to-day interaction, review, and repository synchronization.

GitHub for Windows

GitHub Desktop - Focus on what matters instead of fighting with Git. Whether you're new to Git or a seasoned user, GitHub Desktop simplifies your development workflow. for more, Click here

Git for All Platforms

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Git is easy to learn and has a tiny footprint with lightning fast performance. It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with features like cheap local branching, convenient staging areas, and multiple workflows.

GIT BASICS

REWRITING GIT HISTORY

GIT BRANCHES

REMOTE REPOSITORIES

GIT MERGE

UNDOING CHANGES

Additional Options

GIT DIFF

GIT SHOW

GIT RESET

TEMPORARY COMMITS

GIT REBASE

GIT CONFIG

GIT LOG

GIT PULL

GIT PUSH

TRACKING PATH CHANGES

IGNORING PATTERNS

THE ZOO OF WORKING AREAS

GIT BASICS

REWRITING GIT HISTORY

GIT BRANCHES

REMOTE REPOSITORIES

GIT MERGE

UNDOING CHANGES

Additional Options

GIT DIFF

GIT SHOW

GIT RESET

TEMPORARY COMMITS

GIT REBASE

GIT CONFIG

GIT LOG

GIT PULL

GIT PUSH

TRACKING PATH CHANGES

IGNORING PATTERNS

THE ZOO OF WORKING AREAS

INSTALLATION & GUIS

GitHub for Windows

GitHub for Mac

Git for All Platforms