History Rewriting

# Revert a single commit
wit revert <commit>

# Revert multiple commits
wit revert <commit1> <commit2>

# Revert without creating a commit (stage changes only)
wit revert -n <commit>

# Revert a merge commit (specify parent)
wit revert -m 1 <merge-commit>

# Revert the last commit
wit revert HEAD

# Output:
# ✓ Revert completed: 1 commit(s) created
#   abc1234

# Revert a specific commit
wit revert abc1234

# Revert multiple commits (creates one revert commit per original)
wit revert abc1234 def5678

# Revert a merge commit
wit revert -m 1 abc1234

# If revert causes conflicts:
wit revert abc1234
# error: Revert stopped due to conflicts in 2 file(s)
# 
# Conflicts in:
#   src/file1.ts
#   src/file2.ts

# Resolve conflicts, then continue
wit add src/file1.ts src/file2.ts
wit revert --continue

# Or abort the revert
wit revert --abort

# Undo commit, keep changes staged
wit reset --soft HEAD~1

# Undo commit, keep changes unstaged (default)
wit reset --mixed HEAD~1

# Undo commit, discard all changes
wit reset --hard HEAD~1

# Unstage a file
wit reset <file>

# Go back 1 commit
wit reset HEAD~1
wit reset HEAD^

# Go back 3 commits
wit reset HEAD~3
wit reset HEAD^^^

# Reset to specific commit
wit reset abc1234

# Reset to branch
wit reset origin/main

# Undo last commit but keep changes staged (ready to recommit)
wit reset --soft HEAD~1
# ✓ Reset soft to abc1234
#   Was: def5678
# Your changes are still staged.

# Undo last commit, unstage changes (for editing before recommit)
wit reset HEAD~1
# ✓ Reset mixed to abc1234
#   Was: def5678
# Your changes are preserved but unstaged.

# Completely discard last 3 commits
wit reset --hard HEAD~3
# ✓ Reset hard to abc1234
#   Was: def5678
# Working directory has been reset.

# Unstage a file
wit reset src/file.ts
# Unstaged: src/file.ts

# If you accidentally reset --hard, use undo
wit undo

# Or check the reflog
wit reflog
wit reset --hard <previous-hash>

# Apply a single commit
wit cherry-pick <commit>

# Apply multiple commits
wit cherry-pick <commit1> <commit2> <commit3>

# Apply without committing
wit cherry-pick -n <commit>

# Continue after resolving conflicts
wit cherry-pick --continue

# Abort cherry-pick
wit cherry-pick --abort

# Skip current commit
wit cherry-pick --skip

# Cherry-pick a bug fix from another branch
wit cherry-pick abc1234

# Output:
# ✓ Cherry-pick completed: 1 commit(s) applied
#   def5678

# Cherry-pick multiple commits
wit cherry-pick abc1234 def5678 ghi9012

# Cherry-pick without committing (combine multiple picks)
wit cherry-pick -n abc1234
wit cherry-pick -n def5678
wit commit -m "Combined cherry-picks"

# If cherry-pick causes conflicts:
wit cherry-pick abc1234
# error: Cherry-pick stopped due to conflicts in 1 file(s)

# Resolve conflicts
# Edit the conflicted files
wit add resolved-file.ts
wit cherry-pick --continue

# Or skip this commit
wit cherry-pick --skip

# Or abort entirely
wit cherry-pick --abort

# Rebase current branch onto main
wit rebase main

# Rebase onto a specific commit
wit rebase <commit>

# Interactive rebase (coming soon)
wit rebase -i HEAD~3

# Continue after resolving conflicts
wit rebase --continue

# Abort rebase
wit rebase --abort

# Skip current commit
wit rebase --skip

Before rebase:
      A---B---C  (feature)
     /
D---E---F---G  (main)

After `wit rebase main`:
              A'--B'--C'  (feature)
             /
D---E---F---G  (main)

# Update feature branch with latest main
wit switch feature
wit rebase main

# Output:
# Rebasing feature onto main...
# ✓ Successfully rebased 3 commits

# If conflicts occur:
# Resolve conflicts in the file
wit add resolved-file.ts
wit rebase --continue