summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Re-implement "morph init" using the new Workspace classLars Wirzenius2013-07-313-45/+64
* Add a Workspace classLars Wirzenius2013-07-313-0/+190
* Merge branch 'liw/b-and-m-yarns'Lars Wirzenius2013-07-315-0/+875
|\
| * Refactor code for clarityLars Wirzenius2013-07-311-4/+4
| * Remove commented out debug statementsLars Wirzenius2013-07-311-2/+0
| * Add scenario (yarn) tests for most of branching and mergingLars Wirzenius2013-07-305-0/+877
* | Fix copyright yearLars Wirzenius2013-07-311-1/+1
* | Merge remote-tracking branch 'origin/jonathan/cross-bootstrap-rebase'Lars Wirzenius2013-07-3119-217/+641
|\ \
| * | Add morph cross-bootstrapSam Thursfield2013-07-3019-217/+641
|/ /
* | Merge branch 'jonathan/check-lorried-gitmodules-3'Jonathan Maw2013-07-251-0/+121
|\ \ | |/ |/|
| * Add a script to check every .gitmodules file in a system branchJonathan Maw2013-07-251-0/+121
|/
* Add ARGS to the foreach argument synopsisTiago Gomes2013-07-221-2/+2
* Fix up code formattingLars Wirzenius2013-07-221-3/+4
* show short sha of local cached artifactPaul Sherwood2013-07-221-2/+3
* Merge branch 'liw/copyright-years'Lars Wirzenius2013-07-183-3/+3
|\
| * Fix copyright yearsLars Wirzenius2013-07-183-3/+3
|/
* Merge branch 'liw/fix-localhost-in-tests'Lars Wirzenius2013-07-185-5/+5
|\
| * Use 127.0.0.1 instead of localhostLars Wirzenius2013-07-183-3/+3
| * Add missing copyright yearLars Wirzenius2013-07-181-1/+1
| * Add missing copyright yearLars Wirzenius2013-07-181-1/+1
* | Merge branch 'baserock/richardmaw/bugfix/trovectl-cannot-add-sshkey'Richard Maw2013-07-181-1/+1
|\ \ | |/ |/|
| * Pass stdin to ssh command, so trovectl can add ssh keysRichard Maw2013-07-181-1/+1
* | Import morphlib as we are using morphlib.ErrorTiago Gomes2013-07-171-0/+1
* | Merge branch 'baserock/tiagogomes/gen-anifest2'Tiago Gomes2013-07-121-1/+2
|\ \
| * | Fixups for the Manifest generatorTiago Gomes2013-07-121-1/+2
|/ /
* | Strip trailing whitespace in READMEbaserock-9Jonathan Maw2013-07-091-14/+14
|/
* Merge branch 'liw/subcommand-docs-2'Lars Wirzenius2013-07-0510-41/+618
|\
| * Improve docstring for "morph generate-manifest"Lars Wirzenius2013-07-051-2/+29
| * Improve docstring for "morph tag"Lars Wirzenius2013-07-051-1/+22
| * Improve docstring for "morph trovectl"Lars Wirzenius2013-07-051-1/+22
| * Improve docstring for "morph show-dependencies"Lars Wirzenius2013-07-051-1/+12
| * Improve docstring for "morph run-in-artifact"Lars Wirzenius2013-07-051-1/+14
| * Improve docstring for "morph copy-artifacts"Lars Wirzenius2013-07-051-2/+24
| * Improve docstring for "morph list-artifacts"Lars Wirzenius2013-07-051-2/+15
| * Improve docstring for "morph expand-repo"Lars Wirzenius2013-07-051-3/+21
| * Improve docstring for "morph workspace"Lars Wirzenius2013-07-051-1/+1
| * Improve docstring for "morph update-gits"Lars Wirzenius2013-07-051-1/+16
| * Improve docstring for "morph unpetrify"Lars Wirzenius2013-07-051-1/+5
| * Improve docstring for "morph status"Lars Wirzenius2013-07-051-1/+11
| * Improve docstring for "morph show-branch-root"Lars Wirzenius2013-07-051-1/+10
| * Improve docstring for "morph show-system-branch"Lars Wirzenius2013-07-051-1/+1
| * Improve docstring for "morph petrify"Lars Wirzenius2013-07-051-3/+35
| * Improve docstring for "morph merge"Lars Wirzenius2013-07-051-2/+14
| * Improve docstring for "morph init"Lars Wirzenius2013-07-051-1/+22
| * Improve docstring for "morph graph-build-depends"Lars Wirzenius2013-07-051-1/+29
| * Improve docstring for "morph foreach"Lars Wirzenius2013-07-051-1/+20
| * Improve docstring for "morph edit"Lars Wirzenius2013-07-051-1/+59
| * Improve docstring for "morph deploy"Lars Wirzenius2013-07-051-7/+152
| * Improve docstring for "morph checkout"Lars Wirzenius2013-07-051-1/+19
| * Improve docstring for "morph build-morphology"Lars Wirzenius2013-07-051-3/+20