diff --git a/commands/review-pr.md b/commands/review-pr.md index 70189b4..fdaaaf9 100644 --- a/commands/review-pr.md +++ b/commands/review-pr.md @@ -6,8 +6,7 @@ argument-hint: # Review PR #$1 1. **View PR details**: `fj pr view $1` -2. **Check status**: `fj pr status $1` -3. **Get the diff**: `fj pr view $1 diff` +2. **Get the diff**: `fj pr view $1 diff` Review the changes and provide feedback on: - Code quality @@ -16,6 +15,6 @@ Review the changes and provide feedback on: - Documentation Ask the user what action to take: -- **Merge**: `fj pr merge $1` - Approve and merge the PR +- **Merge**: Post review summary as comment, then `fj pr merge $1 -d` (deletes branch after merge) - **Request changes**: `fj pr comment $1 ""` - Leave feedback without merging - **Comment only**: `fj pr comment $1 ""` - Add a comment for discussion diff --git a/skills/forgejo/SKILL.md b/skills/forgejo/SKILL.md index aece92c..0905010 100644 --- a/skills/forgejo/SKILL.md +++ b/skills/forgejo/SKILL.md @@ -54,15 +54,15 @@ fj pr view diff # PR diff fj pr create "" --body "<body>" fj pr create "<title>" --body "Closes #<issue>" -# PR status -fj pr status <number> # CI status, reviews - # Comment on PR fj pr comment <number> "<comment>" # Merge -fj pr merge <number> -fj pr merge <number> --squash +fj pr merge <number> # Default merge +fj pr merge <number> -d # Delete branch after merge +fj pr merge <number> -M squash # Squash commits +fj pr merge <number> -M rebase # Rebase commits +fj pr merge <number> -M rebase-merge # Rebase then merge commit ``` ### Repository