القائمة
MANDATORY: Use instead of `git commit --amend` - verifies HEAD and push status first
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Guide for writing clear, descriptive commit messages
Merge task branch to base branch with linear history (works from task worktree)
MANDATORY: Use instead of `git rebase` - provides automatic backup and conflict recovery
MANDATORY: Use instead of `git rebase -i` for squashing - unified commit messages
Analyze mistakes with conversation length as potential cause (CAT-specific)
Run scheduled retrospective analysis, derive action items, and track effectiveness
| name | git-amend |
| description | MANDATORY: Use instead of `git commit --amend` - verifies HEAD and push status first |
Purpose: Safely amend the most recent commit with proper verification checks.
# Check if pushed:
git status
# Look for: "Your branch is ahead of 'origin/main' by X commits"
# "up to date" = already pushed (amending creates divergent history)
# 1. Verify HEAD is the commit you want to amend
git log --oneline -1
# 2. Verify not pushed to remote
git status # Must show "ahead of origin"
# 3. Make your changes (edit files, stage new files)
git add <files>
# 4. Amend the commit
git commit --amend
# Or with new message:
git commit --amend -m "New message"
# Or keep same message:
git commit --amend --no-edit
# Edit the file
vim file.txt
# Stage and amend
git add file.txt
git commit --amend --no-edit
git add forgotten-file.txt
git commit --amend --no-edit
git commit --amend -m "Better commit message"
# Only amend unpushed commits
git push origin main
git commit --amend # Creates divergent history!
# Only amend your own commits
git pull # Pulls teammate's commit
git commit --amend # Rewrites their work!
# If you must amend after push (with explicit permission):
git commit --amend
git push --force-with-lease # Safer than --force
To modify a commit that's NOT at HEAD, use interactive rebase:
# 1. Start interactive rebase
git rebase -i <commit>^ # Parent of commit to edit
# 2. Change 'pick' to 'edit' for the target commit
# 3. Make changes when rebase stops
git add <files>
git commit --amend
# 4. Continue rebase
git rebase --continue
# If amend was wrong, check reflog for original:
git reflog
git reset --hard HEAD@{1} # Go back to before amend