Merge main into #125: keep both synopsis lines 87322662f607 resolution
#124 (show --stat) and #125 (amend PATH..) edited neighbouring lines of the spec's command synopsis; both kept.
- Author
- Andy McCall @andymccall <[email protected]>
- via
- agent
agent:claude@andymccall <[email protected]> · keyless, under your grant for changes,refs,seal · key c5cb53f53603
- When
- · 2026-10-18 20:26 UTC
- Signature
- ◈ sealed by agent:claude@andymccall
- Hash
87322662f6071da6c4163ee07cbafab7424b9095628ff14cd67ccbf6e290575c- Depends on
- 0299076f09a2 2c9ddac3c387 69953b507188 ff0af1ee299d
- Depended on by
- 9bd98cfb4f7e 157d02e95586
- In bookmarks
- doctor-trust identical-sides keyless-tags main paths-for-resolutions-and-amend push-notes subrepo-pin-state
- In tags
- v0.10.0 v0.11.0 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0
- Edits
- 2 atoms, 0 tree operations, 1 file
Browse the tree at this change
modified docs/spec.md +1 −1
| … | 875 unchanged lines |
||
| 876 | 876 | oxy status [--json] oxy diff oxy prompt [--format F] |
|
| 877 | 877 | oxy commit -m MSG [--depends-on CHANGE].. |
|
| 878 | 878 | oxy log [-r REVSET] [-n N] [-v] [-L S,E:PATH] oxy show CHANGE | -r REVSET [--stat] |
|
| 879 | - | <<<<<<< oxy conflict 1 of 1, side 1 of 2: deleted by change e374408d "oxy show --stat: the files a change touched, with lines added and removed" |
|
| 879 | + | oxy describe [CHANGE] [-m MSG] oxy amend [-m MSG] [--into CHANGE | PATH..] |
|
| 880 | 880 | ------- |
|
| 881 | 881 | oxy log [-r REVSET] [-n N] [-v] [-L S,E:PATH] oxy show CHANGE | -r REVSET |
|
| 882 | 882 | ======= oxy conflict 1 of 1, side 2 of 2: change 8a17bd24 "Commit a resolution by paths, and amend only some paths" |
|
| … | 169 unchanged lines |