Git Cheatsheet

Quick reference for Git commands covering basics, branching, remote operations, stash, log, rebase, tagging, and configuration

79 commands

git init

Initialize a new Git repository

git init

git clone

Clone a remote repository

git clone https://github.com/user/repo.git

git clone --depth

Create a shallow clone

git clone --depth 1 https://github.com/user/repo.git

git add

Add files to staging area

git add file.txt

git add -A

Add all changes to staging

git add -A

git add -p

Stage changes interactively

git add -p

git commit

Commit staged changes

git commit -m 'Add new feature'

git commit --amend

Amend last commit

git commit --amend -m 'Updated message'

git status

Show working tree status

git status

git rm

Remove file and stage deletion

git rm file.txt

git rm --cached

Untrack file without deleting

git rm --cached secret.env

git mv

Move or rename a file

git mv old_name.txt new_name.txt

git branch

List local branches

git branch

git branch -a

List all branches including remote

git branch -a

git branch (create)

Create a new branch

git branch feature/login

git branch -d

Delete merged branch

git branch -d feature/login

git branch -D

Force delete branch

git branch -D feature/experimental

git branch -m

Rename a branch

git branch -m old-name new-name

git checkout

Switch to a branch

git checkout main

git checkout -b

Create and switch to branch

git checkout -b feature/signup

git switch

Switch branch (modern command)

git switch main

git switch -c

Create and switch branch (modern)

git switch -c feature/dashboard

git remote -v

List remote repositories

git remote -v

git remote add

Add a remote repository

git remote add origin https://github.com/user/repo.git

git remote remove

Remove a remote repository

git remote remove upstream

git remote rename

Rename a remote repository

git remote rename origin upstream

git fetch

Fetch changes without merge

git fetch origin

git fetch --prune

Prune deleted remote branches

git fetch --prune

git pull

Fetch and merge remote changes

git pull origin main

git pull --rebase

Pull with rebase

git pull --rebase origin main

git push

Push local changes to remote

git push origin main

git push -u

Push and set upstream branch

git push -u origin feature/login

git push --force-with-lease

Safe force push

git push --force-with-lease

git stash

Stash current changes

git stash

git stash -m

Stash with message

git stash -m 'WIP: login feature'

git stash list

List all stashes

git stash list

git stash pop

Apply and remove latest stash

git stash pop

git stash apply

Apply stash without removing

git stash apply stash@{0}

git stash drop

Drop a stash

git stash drop stash@{0}

git stash clear

Clear all stashes

git stash clear

git stash show

Show stash changes

git stash show -p stash@{0}

git stash branch

Create branch from stash

git stash branch feature/from-stash stash@{0}

git log

Show commit history

git log

git log --oneline

Show compact commit history

git log --oneline

git log --graph

Show log with branch graph

git log --graph --oneline --all

git log -p

Show log with diffs

git log -p -2

git log --author

Show commits by author

git log --author='John'

git log --since

Show commits since date

git log --since='2024-01-01'

git diff

Show unstaged changes

git diff

git diff --staged

Show staged changes

git diff --staged

git diff branch1..branch2

Show diff between branches

git diff main..feature/login

git blame

Show who changed each line

git blame file.txt

git shortlog

Show commit summary by author

git shortlog -sn

git merge

Merge a branch

git merge feature/login

git merge --no-ff

Merge without fast-forward

git merge --no-ff feature/login

git merge --squash

Squash merge

git merge --squash feature/login

git rebase

Rebase current branch

git rebase main

git rebase --abort

Abort rebase

git rebase --abort

git rebase --continue

Continue rebase after conflict

git rebase --continue

git cherry-pick

Apply specific commit

git cherry-pick abc1234

git revert

Create commit that reverts changes

git revert abc1234

git reset --soft

Undo commit keeping changes staged

git reset --soft HEAD~1

git reset --mixed

Undo commit keeping changes unstaged

git reset HEAD~1

git tag

List all tags

git tag

git tag (lightweight)

Create lightweight tag

git tag v1.0.0

git tag -a

Create annotated tag

git tag -a v1.0.0 -m 'Release v1.0.0'

git tag -d

Delete local tag

git tag -d v1.0.0

git push origin --tags

Push all tags to remote

git push origin --tags

git push origin --delete tag

Delete remote tag

git push origin --delete v1.0.0

git show tag

Show tag details

git show v1.0.0

git config --global user.name

Set global user name

git config --global user.name 'John Doe'

git config --global user.email

Set global email

git config --global user.email 'john@example.com'

git config --list

List all config settings

git config --list

git config --global core.editor

Set default editor

git config --global core.editor 'vim'

git clean -fd

Remove untracked files

git clean -fd

git clean -n

Dry run to see files to clean

git clean -n

git bisect start

Start binary search for bug

git bisect start

git reflog

Show reference log

git reflog

git worktree add

Add a working tree

git worktree add ../feature-branch feature/login