summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Remove mention of the cache directory inside .morph from specLars Wirzenius2012-03-271-1/+1
|
* Add note that the code does not yet match the codeLars Wirzenius2012-03-271-0/+2
|
* Add "morph merge" subcommandLars Wirzenius2012-03-231-2/+3
| | | | | 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.
* Add documentation for branching and mergingLars Wirzenius2012-03-221-0/+339