Skip to content

Commit 5dbac76

Browse files
cpcloudclaude
andauthored
docs(agents): prefer git pull --rebase over fetch+rebase (#752)
## Summary - Add rule to use `git pull --rebase origin main` as a single command instead of separate `git fetch` + `git rebase` steps - Update `/rev` skill to match Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 8fda35a commit 5dbac76

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

.claude/commands/rev.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ Rebase onto the latest main, address PR review feedback, and fix failing CI.
55

66
## 1. Rebase onto main
77

8-
1. `git fetch origin main`
9-
2. `git rebase origin/main`
10-
3. If there are conflicts, resolve them, `git add` the resolved files, and
8+
1. `git pull --rebase origin main`
9+
2. If there are conflicts, resolve them, `git add` the resolved files, and
1110
`git rebase --continue`. Repeat until the rebase completes.
1211

1312
## 2. Address PR review feedback and fix CI (parallel)

AGENTS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ details; do not duplicate that detail here.
210210

211211
### Git and CI
212212

213+
- **Rebase with one command**: Use `git pull --rebase origin main` instead
214+
of separate `git fetch origin main` + `git rebase origin/main`.
213215
- **Reply to PR review comments**: After addressing a PR review comment,
214216
reply to the comment on GitHub (via `gh api .../replies`) explaining
215217
how it was addressed (commit hash, what changed, tests added). Do this

0 commit comments

Comments
 (0)