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
2 changes: 1 addition & 1 deletion docs/commands/diff.md
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ context = "white"
- [`atomic add`](./add.md) - Add files to track their changes
- [`atomic change`](./change.md) - View diffs of recorded changes
- [`atomic log`](./log.md) - View history of changes
- [`atomic reset`](./reset.md) - Discard working copy changes
- [`atomic restore`](./restore.md) - Discard working copy changes

## Related Concepts

Expand Down
2 changes: 1 addition & 1 deletion docs/commands/insert.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ Because Atomic uses a single canonical GRAPH with view filters, inserting a chan
- **Dependencies**: Transitive dependencies are computed and inserted automatically. A change cannot be inserted without every change it depends on already present in the target view.
- **Idempotent**: Inserting a change that already exists in the view is a no-op.
- **Source unchanged**: The source view is never modified by an insert operation.
- **Working copy**: Use `atomic reset` after insert to update the working copy if needed.
- **Working copy**: Use `atomic restore` after insert to update the working copy if needed.
- **Conflicts**: True conflicts only arise when changes modify the same graph region in incompatible ways.

## See Also
Expand Down
8 changes: 4 additions & 4 deletions docs/commands/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Every command listed here corresponds to a real subcommand in the `atomic` CLI b
| [`log`](log.md) | Show change history |
| [`change`](change.md) | Inspect a specific change |
| [`insert`](insert.md) | Insert changes into a view |
| [`reset`](reset.md) | Reset working copy to last recorded state |
| [`restore`](restore.md) | Restore working copy to last recorded state |
| [`split`](split.md) | Create a new view from an existing one |
| [`view`](view.md) | Manage views (create, switch, list, delete) |
| [`stash`](stash.md) | Temporarily save uncommitted changes |
Expand Down Expand Up @@ -66,17 +66,17 @@ atomic log # View history

### Repository Management

Create, clone, and reset repositories:
Create, clone, and restore repositories:

```bash
atomic init myproject # Create a new repo
atomic clone https://... # Clone from remote
atomic reset --force # Discard uncommitted changes
atomic restore --force # Discard uncommitted changes
```

- **[`init`](init.md)** — Initialize a new Atomic repository
- **[`clone`](clone.md)** — Clone an existing repository from a remote
- **[`reset`](reset.md)** — Reset the working copy to the last recorded state
- **[`restore`](restore.md)** — Restore the working copy to the last recorded state
- **[`split`](split.md)** — Create a new view from an existing one

### Views
Expand Down
2 changes: 1 addition & 1 deletion docs/commands/push.md
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ atomic push

Or push from a clean state:
```bash
atomic reset
atomic restore
atomic push
```

Expand Down
16 changes: 8 additions & 8 deletions docs/commands/repository-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Commands for creating, cloning, and managing Atomic repositories.
|---------|-------------|
| [`init`](init.md) | Initialize a new Atomic repository |
| [`clone`](clone.md) | Clone an existing repository from a remote |
| [`reset`](reset.md) | Reset working copy to the last recorded state |
| [`restore`](restore.md) | Restore working copy to the last recorded state |
| [`split`](split.md) | Create a new view from an existing one |

## Creating a Repository
Expand Down Expand Up @@ -52,19 +52,19 @@ atomic clone https://api.atomic.dev/acme/platform/core/code
atomic clone https://api.atomic.dev/acme/platform/core/code myproject
```

## Resetting the Working Copy
## Restoring the Working Copy

The `reset` command discards uncommitted changes and restores the working copy to the last recorded state:
The `restore` command discards uncommitted changes and restores the working copy to the last recorded state (the legacy name `reset` still works as an alias):

```bash
# Discard all uncommitted changes
atomic reset --force
atomic restore --force

# Reset specific files
atomic reset src/main.rs
# Restore specific files
atomic restore src/main.rs

# Preview what would be reset
atomic reset --dry-run
# Preview what would be restored
atomic restore --dry-run
```

## Splitting Views
Expand Down
Loading