Git Reference & Cheatsheet — Complete Command Guide

git config --global user.name "Name"
git config --global user.email "email"
git config --global init.defaultBranch main
git config --global color.ui auto
git config --global core.editor nano
git config --global alias.lg "log --oneline --graph --decorate"
git config --list
git config user.name              # view single value

git help <command>
git <command> --help
git <command> -h                  # concise help

git init                          # new empty repo
git clone URL                     # copy existing repo
git clone --depth 1 URL           # shallow clone (faster)
git clone --recurse-submodules URL  # include submodules

git status                        # show state
git status -sb                    # short + branch
git add <file>                    # stage file
git add .                         # stage all
git add -p                        # stage interactively (hunk by hunk)
git commit -m "message"           # commit staged
git commit -am "message"          # add + commit (tracked files only)
git commit --amend -m "new msg"   # fix last commit message
git commit --amend --no-edit      # add to last commit, keep message

git log                           # full history
git log --oneline                 # compact
git log --graph                   # with branch graph
git log -p                        # with diffs
git log -n 5                      # last 5 commits
git log --author="name"           # filter by author
git log --since="2024-01-01"      # filter by date
git log --grep="fix"              # filter by message
git log --follow <file>           # history of a file (incl. renames)
git show <commit>                 # show commit details + diff

git diff                          # unstaged changes
git diff --staged                 # staged changes
git diff <commit> <commit>        # between two commits
git diff <branch>..<branch>       # between branches
git diff HEAD~3 HEAD              # 3 commits ago vs now
git blame <file>                  # who changed each line

git branch                        # list local branches
git branch -a                     # list all (local + remote)
git branch -v                     # with last commit
git branch <name>                 # create branch
git branch -d <name>              # delete merged branch
git branch -D <name>              # force delete unmerged
git branch -m <old> <new>         # rename
git checkout <branch>             # switch branch
git checkout -b <branch>          # create + switch
git switch <branch>               # switch (modern)
git switch -c <branch>            # create + switch (modern)

git merge <branch>                # merge into current
git merge --no-ff <branch>        # force merge commit
git merge --abort                 # abort conflicted merge
git mergetool                     # launch merge tool
git log --merge                   # show conflicting commits

git rebase <branch>               # replay commits on top
git rebase -i HEAD~3              # interactive (squash, reword, reorder)
git rebase --continue             # continue after conflict resolution
git rebase --skip                 # skip a commit
git rebase --abort                # cancel rebase

git cherry-pick <commit>          # apply a specific commit
git cherry-pick <a> <b>           # apply multiple
git cherry-pick <a>..<b>          # apply range
git cherry-pick --no-commit <c>   # stage changes only, don't commit

git stash                         # save changes
git stash push -m "message"       # save with message
git stash -u                      # include untracked files
git stash list                    # list stashes
git stash apply                   # apply latest stash (keep)
git stash pop                     # apply and remove
git stash apply stash@{2}         # apply specific stash
git stash drop stash@{0}          # drop specific stash
git stash clear                   # remove all stashes
git stash branch <name>           # create branch from stash

git restore <file>                # discard unstaged changes
git restore --staged <file>       # unstage (keep changes)
git checkout -- <file>            # discard (older syntax)
git reset HEAD~1                  # undo last commit (keep changes)
git reset --soft HEAD~1           # undo last commit (keep staged)
git reset --hard HEAD~1           # undo + discard changes
git revert HEAD                   # new commit undoing last
git revert <commit>               # new commit undoing specific
git clean -fd                     # remove untracked files/dirs

git remote -v                     # list remotes
git remote add <name> <url>       # add remote
git remote remove <name>          # remove remote
git remote rename <old> <new>     # rename remote
git remote set-url <name> <url>   # change URL
git remote show <name>            # detailed info
git fetch <remote>                # download objects/refs
git fetch --prune                 # fetch + prune deleted branches
git pull                          # fetch + merge
git pull --rebase                 # fetch + rebase
git push                          # push to tracked remote
git push -u origin <branch>       # push + set upstream
git push --tags                   # push all tags
git push --force                  # force push (dangerous)
git push --force-with-lease       # safer force push
git push origin --delete <branch> # delete remote branch

git tag                           # list tags
git tag -a v1.0.0 -m "message"    # annotated tag
git tag v1.0.0                    # lightweight tag
git tag -d v1.0.0                 # delete local
git push origin v1.0.0            # push specific tag
git push --tags                   # push all tags
git push origin --delete v1.0.0   # delete remote tag
git checkout v1.0.0               # checkout tag (detached)

git reflog                        # show HEAD movements
git reflog <branch>               # show branch movements
git reset --hard HEAD@{2}         # reset to reflog entry
git checkout HEAD@{2}             # checkout reflog entry
git branch recover <hash>         # create branch at old commit

git submodule add <url> <path>    # add submodule
git submodule update --init       # init + fetch submodules
git submodule update --remote     # update to latest
git lfs install                   # init LFS
git lfs track "*.psd"             # track large files
git lfs ls-files                  # list tracked files
git commit -S -m "msg"            # sign commit
git tag -s v1.0.0 -m "msg"       # sign tag
git bisect start                  # binary search for bug
git bisect bad                    # current is bad
git bisect good <commit>          # mark known good commit
git blame <file>                  # show last modification per line
git shortlog -sn                  # contributors ranked by commits
git gc                            # garbage collection (optimize)
git fsck                          # check repository integrity
git archive --format=zip HEAD     # export repo as zip
git bundle create file.bundle --all  # bundle as single file
git clean -fd                     # remove untracked files/dirs
git describe                      # nearest tag to current HEAD

git config --global alias.lg "log --oneline --graph --all --decorate"
git config --global alias.ci "commit"
git config --global alias.co "checkout"
git config --global alias.br "branch"
git config --global alias.st "status -sb"
git config --global alias.unstage "reset HEAD --"
git config --global alias.last "log -1 HEAD"
git config --global alias.visual "!gitk"