Show file change history

Show full diff history of a file including renames

git log --follow -p -- path/to/file.py

More git commands

Undo last commit (keep changes)

git reset --soft HEAD~1

Move HEAD back one commit, keeping staged changes
Clean untracked files

git clean -fd

Remove untracked files and directories from working tree
Show branches merged into main

git branch --merged main

List local branches already merged into main
Interactive rebase last N commits

git rebase -i HEAD~5

Squash, reorder, or edit the last 5 commits
Cherry-pick commit

git cherry-pick <sha>

Apply a single commit from another branch