git-advanced

Git bisect identifies bug-introducing commits by binary searching your history. You mark known good and bad commits, and git automatically checks out intermediate versions to isolate the exact change causing the regression.

Interactive rebase optimizes commit history by allowing you to squash, reorder, or edit commits. It opens an editor to select actions for each commit, producing a cleaner, linear history before merging or pushing.

Git worktrees manage multiple branches simultaneously without stashing. They create additional working directories linked to your repository, allowing you to check out different branches in parallel folders.

Pre-commit hooks run linters and enforce commit message conventions before pushing. They execute custom scripts automatically when you commit, blocking the operation if quality checks fail.

Advanced git recovery requires a git repository with a .git directory and appropriate permissions to execute scripts. These techniques recover from common errors using internal git commands and references.

To resolve a merge conflict and rebase, first resolve file conflicts manually and stage them. Then run git rebase onto the latest main branch to replay your feature commits linearly over the updated base.