Defame1297
2c6ce438b6
Two bundled fixes across the same nine skills, since both touch the same files. Issue #113: skill prose used rtk git and bare git inconsistently for the same operations, with no stated rule for which applied where. Executable instructed commands (a dispatch-table "Run" cell, a fenced code-block procedure, an imperative step) now consistently use rtk git; illustrative or referential mentions -- naming a flag's behavior, quoting a doc heading, warning against an anti-pattern -- stay bare git. Documented in the new plugins/git/README.md, scoped to this plugin only: gitea-* skills talk to the server over MCP tools and carry no git/rtk mentions at all. Also the git-plugin slice of #127: metadata.version added to the eight skills that lacked it. git-commits already had one and is untouched. Fixes: #113 Fixes: #127 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.
|