| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Rewrite 'merge' command | Sam Thursfield | 2012-09-10 | 1 | -1/+0 |
| | | | | | | | 'merge' now traverses every system in the branch root (baserock:morphs) and merges any chunk or stratum that was changed with 'morph edit'. It also takes care of updating the refs in the target branch. | ||||
| * | Add "morph merge" subcommand | Lars Wirzenius | 2012-03-23 | 1 | -0/+1 |
| This is highly simplisitic, and it's going to be highly painful to use, but it does the very basics of what we need, I think. | |||||
 |
index : baserock/baserock/morph.git | |
| Morph -- Baserock build tool |
| summaryrefslogtreecommitdiff |