summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Remove petrify and unpetrify commandsRichard Maw2014-08-121-31/+1
| | | | | | | We don't use this any more, and instead prefer to always keep definitions.git petrified, and update the refs ourselves. branch-from-image still uses some of the remaining petrify code.
* Rename the "morph minedir" command to "morph workspace"Jannis Pohlmann2012-08-291-14/+14
| | | | | | | | | | | | Mine may be a nice metaphor but it is not very intuitive. Hence, this commit renames "mine" to "workspace". This affects not just the branch and merge plugin (the only code that changes) but also documentation and tests, which are updated along with the code in this commit. I decided to omit the "dir" suffix in the command because I think people know well that a workspace will be a directory in this case and that allows us to refer to this concept with one word ("workspace") instead of two words ("workspace directory").
* branch+merge: add why we petrify to walkthroughRichard Maw2012-05-221-0/+4
|
* 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