Just came across Flight rules for Git and it’s the kind of thing I’ve wanted for years. For example:

• “I wrote the wrong thing in a commit message”
• “I accidentally committed and pushed a merge”
• “I want to discard specific unstaged files”

Great structure, very helpful. Highly recommended.