summaryrefslogtreecommitdiff
path: root/doc/branching-merging-systems.mdwn
Commit message (Expand)AuthorAgeFilesLines
* Remove petrify and unpetrify commandsRichard Maw2014-08-121-31/+1
* Rename the "morph minedir" command to "morph workspace"Jannis Pohlmann2012-08-291-14/+14
* 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
* Add documentation for branching and mergingLars Wirzenius2012-03-221-0/+339