Git Advanced Cheat Sheet

git rebase -i HEAD~5

# Open the last 5 commits in the interactive rebase todo list.

git commit --amend --no-edit

# Replace the most recent commit using the current staged changes.

git rebase --onto main old-base feature

# Move a branch from one base commit or branch to another.

git filter-branch --subdirectory-filter path/to/subdir -- --all

# Create a new history containing only one subdirectory.

git rebase -i --rebase-merges main

# Rebase while preserving merge topology.

git reflog --date=local

# Inspect branch and HEAD movements with readable times.

git bisect start && git bisect bad && git bisect good <known_good_commit>

# Begin a binary search to find the commit that introduced a bug.

git show ORIG_HEAD

# View the previous HEAD after disruptive operations.

git fsck --full

# Verify object connectivity and repository health.

git worktree add ../feature feature-branch

# Check out another branch in a separate directory without cloning again.

git stash push -u -m "WIP before rebase"

# Save tracked and untracked work temporarily.

git clean -ndx

# Dry-run a repository cleanup before deleting anything.

git rerere status

# Inspect recorded conflict-resolution reuse state.

git cherry-pick -n <start_commit>^..<end_commit>

# Apply commit changes into the index and working tree first.

git submodule update --init --recursive

# Populate nested submodules after clone or after config changes.

git notes add -m "Reviewed by security team" <commit_sha>

# Add metadata to a commit without rewriting it.

git range-diff main...feature-v1 main...feature-v2

# Review how a patch series changed across rebases.