git-edit-commitlisted

# Git Edit Commit This skill outlines how agents can edit previous commits. Agents can't use `git rebase -i` directly, which requires a TTY. This skill provides helper scripts instead. REQUIRED: Always reference commits by SHA, not by HEAD-relative notation like `HEAD~3`. ## Inspect Commits First Run `git log --oneline` to get SHAs. Output is newest-first; the rebase plan is oldest-first. ## Amending the Latest Commit To fold staged changes into the most recent commit without changing its message: ```bash git add <files> git commit --amend --no-edit ``` ## Fixup and Squash (Recommended Shortcut) ```bash git commit --fixup=<target-sha> # merge into target, discard message git commit --squash=<target-sha> # merge into target, combine messages # <oldest-sha-in-scope>^ is the parent of the oldest commit in scope; use --root if it's the first commit scripts/non-interactive-git-rebase.sh --autosquash <oldest-sha-in-scope>^ ``` ## Drop, Reorder, Edit Use `scripts/non-interactive-git-rebase.sh`. Supply the plan via stdin. Use `--root` when the oldest commit in scope is the repository's first commit. ```bash scripts/non-interactive-git-rebase.sh <oldest-sha-in-scope>^ <<'PLAN' pick abc1234 Keep this commit squash def5678 Merge this into the previous drop ghi9012 Remove this commit entirely PLAN ``` ### Edit Mark the commit `edit` in the plan. Git pauses there. Then: ```bash git add <files> git commit --amend --no-edit git rebase --continue ``` ## Reword ```bash sc