OXYGENHUB

History of rebase 3 changes

In src/cli/workspace.rs, lines 1875–1922 on e266b7d4065cf05d339a592be8c87d877bddf9f443dad0021a870c3d5988e9ad. 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 1875,1922:src/cli/workspace.rs.

Rebase: --into-working-copy resolves a conflicted rebase in the working copy (closes #42) head
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