Defame1297
af8b46cd57
Regenerate plugins/*/skills/ from plugins/*/.apm/ after the previous four commits, via scripts/sync-plugin-content.sh --all. The mirror is generated output (ADR-0017) that check-plugin-content-sync's pre-push hook diffs against .apm/; nothing here is hand-edited. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EeH8SCbcrCAQrtymkNuhKP
17 lines
725 B
Markdown
17 lines
725 B
Markdown
---
|
|
source_keys:
|
|
- context7-git-htmldocs
|
|
---
|
|
|
|
# Comparing two branches
|
|
|
|
The two-dot and three-dot forms mean different things and are easy to swap by accident — check the
|
|
direction before reporting a result.
|
|
|
|
- `rtk git log main..feature` — commits on `feature` that are not on `main`.
|
|
- `rtk git log feature..main` — the reverse direction: commits on `main` not on `feature`.
|
|
- `rtk git log --left-right main...feature` — both diverging sets at once (symmetric difference).
|
|
- `rtk git diff main...feature` — the diff from the common ancestor to `feature`'s tip, which is what
|
|
a reviewer sees, rather than the diff between the two tips.
|
|
- `rtk git merge-base main feature` — print the common ancestor commit.
|