Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions skills/atomic-vcs/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,31 @@ depends on, who/what authored it, what it cost, and the reasoning that produced

## `atomic diff` — precise edits

`-c` **selects which change to show** — it is not a comparison target. The two modes
answer different questions:

```bash
atomic diff # working copy vs. recorded state, all modified tracked files
atomic diff src/auth.rs # one or more specific files
atomic diff -c R4YQ # compare against a specific change
atomic diff -c R4YQ # what did change R4YQ do? (state before vs. after it)
atomic diff --stat # summary: files + line counts
atomic diff --name-only # just the changed paths
atomic diff --name-status # paths with M/A/D indicators
atomic diff --json # versioned JSON: per-file hunks, typed lines, rollups
atomic diff --untracked # include untracked files
atomic diff --view dev # compare against another view
atomic diff --view dev # working-copy comparison against another view
atomic diff --word-diff # token-level highlighting (CRDT-powered)
atomic diff --algorithm patience # better for moved blocks (default: myers)
```

A clean working copy is not a dead end: `atomic diff` names real, copy-pasteable
`-c` commands for the most recent changes on the current view. Follow one.

`--json` takes precedence over `--stat`/`--name-only`/`--name-status`, so a consumer
always gets one parseable document. A `-c` diff carries the change header under
`change` (hash, message, authors, date); a working-copy diff carries `view` instead.
A diff with nothing to show still emits valid JSON with an empty `files` array.

`--word-diff` is special to Atomic: it shows exactly which **tokens** changed within a
line, not just that the line changed. Reach for it during code review when a line was
edited subtly.
Expand Down
2 changes: 1 addition & 1 deletion skills/code-intelligence/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@ This extracts file nodes, change history, and tree-sitter entities into the KG.
- Chain: code → search → neighbors → entities → read_file. Each step narrows your focus.
- The content index and KG are built by `atomic vault query enrich` — run it if results seem sparse
- Node IDs are exact strings — a single wrong character means "not found"
- Use `--json` on any command when you need structured output for further processing
- Use `--json` on any command when you need structured output for further processing