OXYGENHUB

History of rebase 4 changes

In src/cli/workspace.rs, lines 2310–2359 on 98a1620a3840a7dc026e58ba7014a13ce09a7b370b85845b00d72f5f369ebef0. Every change that wrote or deleted one of these lines, or deleted a line from between them. Exact, because each line keeps its identity across edits; edits elsewhere in the file are not here. Also: oxy log -L 2310,2359:src/cli/workspace.rs.

The operation log says what each operation did; op restore, op revert and --at-op; commands say where they left you (closes #51, closes #52, closes #53) v0.2.0 head
Andy McCall ·
✔ 98a1620a3840
Rebase: --into-working-copy resolves a conflicted rebase in the working copy (closes #42)
Andy McCall ·
✔ e266b7d4065c
Unbound hosted repositories adopt the first pusher's id
Andy McCall ·
✔ 75167672ebcd
Squash and rebase (spec 0.8 section 8.5): squash folds a change into a dependency with dependents following its atoms; rebase re-derives a change against another base with content-matched correspondence; correspondences keyed by node; spec 0.8a and docs
Andy McCall ·
✔ 728da0f92161