Is it safe to amend a commit that has already been pushed?

Generally, no. Amending a pushed commit creates divergent history. This skill specifically checks if a commit is pushed and warns against amending to prevent issues for other collaborators.

Does this skill support modifying commits further back in history?

Yes, it provides a structured guide for using interactive rebase (git rebase -i) to safely edit commits that are not at the current HEAD.

How do I recover if I accidentally amended the wrong commit?

The skill includes instructions for using 'git reflog' and 'git reset --hard' to move your HEAD back to the state it was in before the amendment occurred.

Can I use this skill to change just the commit message?

Yes, the skill provides a specific workflow for using 'git commit --amend -m' to update a message without needing to change any files.

Git Commit Amending & Safety

Name: Git Commit Amending & Safety
Author: cowwoc

bycowwoc

•

Developer Tools

Streamlines the process of modifying recent Git commits while enforcing strict safety checks to prevent repository history conflicts.

About

The Git Amend Skill provides a specialized workflow for Claude to safely modify the most recent commit or correct errors in local repository history. It prioritizes repository integrity by implementing mandatory verification steps, ensuring that amendments only occur on unpushed commits that the user created in the current session. By providing clear patterns for adding forgotten files, fixing typos, and updating commit messages—alongside advanced guidance for interactive rebasing and reflog recovery—this skill ensures that Git history remains clean and collaborative workflows are never disrupted by accidental force-pushes or divergent branches.

Key Features

Automated workflows for fixing typos and adding forgotten files
Interactive rebase guidance for modifying non-HEAD commits
HEAD verification to ensure the correct commit is targeted
Reflog-based error recovery to undo accidental amendments
Mandatory remote push detection to prevent history divergence
2 GitHub stars

Use Cases

Rewriting local history via interactive rebase to maintain a clean project log
Adding a forgotten configuration file to the most recent unpushed commit
Fixing a typo in the last commit message or code before sharing with the team

About

Key Features

Automated workflows for fixing typos and adding forgotten files
Interactive rebase guidance for modifying non-HEAD commits
HEAD verification to ensure the correct commit is targeted
Reflog-based error recovery to undo accidental amendments
Mandatory remote push detection to prevent history divergence
2 GitHub stars

Use Cases

Rewriting local history via interactive rebase to maintain a clean project log
Adding a forgotten configuration file to the most recent unpushed commit
Fixing a typo in the last commit message or code before sharing with the team