git

Git Operations

Status and Information

git status            # working tree status
git status -s         # short format
git branch -vv        # branches with tracking info

Viewing Changes

# Unstaged / staged / between branches
git diff
git diff --cached
git diff main..feature

# Changes since common ancestor (useful for PRs)
git diff main...feature

# Diff specific file
git diff -- PATH

# Word-level diff
git diff --word-diff

# Stat summary
git diff --stat

# Show a specific commit
git show COMMIT

# Show file at specific commit
git show COMMIT:PATH

Commit History

# Recent commits (compact)
git log --oneline -20

# With diffs
git log -p -5

# Graph view
git log --oneline --graph --all

# With file stats
git log --stat

# Filter by author / date / message / file
git log --author="NAME"
git log --since="2025-01-01" --until="2025-06-01"
git log --grep="fix"
git log -- PATH

# Commits that added/removed a string (pickaxe)
git log -S "function_name"

# Custom format
git log --pretty=format:"%h %ad %s (%an)" --date=short

# Who changed each line
git blame FILE
git blame -L 10,20 FILE

Staging

# Stage specific files
git add FILE1 FILE2

# Stage all tracked file changes
git add -u

# Stage everything (tracked + untracked)
git add -A

# Stage hunks interactively
git add -p

# Unstage file (keep changes)
git reset HEAD FILE

# Discard unstaged changes
git restore FILE

# Restore file from specific commit
git restore --source=COMMIT FILE

Committing

# Commit with message
git commit -m "message"

# Multi-line message
git commit -m "subject" -m "body"

# Stage tracked files and commit
git commit -a -m "message"

# Amend last commit
git commit --amend

# Amend without changing message
git commit --amend --no-edit

# Empty commit (trigger CI)
git commit --allow-empty -m "trigger build"

Undoing Commits

# Revert a commit (creates new inverse commit)
git revert COMMIT

# Revert without auto-commit
git revert --no-commit COMMIT

# Revert a merge commit (keep first parent)
git revert -m 1 MERGE_COMMIT

# Reset to commit (keep changes staged)
git reset --soft COMMIT

# Reset to commit (keep changes unstaged)
git reset --mixed COMMIT

# Reset to commit (discard all changes)
git reset --hard COMMIT