Why should I use this instead of standard git commit --amend?

This skill enforces mandatory safety checks that the standard command ignores, specifically verifying if the commit has already been pushed to avoid breaking the shared repository history.

How do I fix a mistake I made while amending?

The skill includes a recovery workflow using 'git reflog' and 'git reset --hard' to move your branch back to the state it was in immediately before the amend operation.

What happens if I try to amend a commit that has been pushed?

The skill will warn you that amending pushed commits creates divergent history. It provides the 'force-with-lease' workflow only as a last resort for situations where you have explicit permission.

Can this skill help me edit a commit from yesterday?

Yes, if the commit is not at the HEAD, the skill provides a guided interactive rebase workflow to help you target and edit specific commits in your local history safely.

Git Amend Safety

Name: Git Amend Safety
Author: cowwoc

bycowwoc

•

Developer Tools

Enforces safe Git commit amendments by verifying HEAD status and push history before modifying repository history.

The Git Amend Skill provides a structured, safety-first workflow for modifying recent commits. It prevents common version control errors by enforcing mandatory checks to ensure that the commit being modified is the HEAD, was created by the current user, and hasn't been pushed to a remote repository. By automating these pre-checks and providing clear recovery paths via Git reflog, this skill helps developers maintain clean commit histories without the risk of creating divergent branches or overwriting collaborator work.