summaryrefslogtreecommitdiff
path: root/morphlib/plugins/branch_and_merge_plugin.py
Commit message (Expand)AuthorAgeFilesLines
* Add status message on successful `morph checkout` / `morph branch`sam/no-git-update-fixesSam Thursfield2014-11-051-1/+2
* Make branch and merge commands honour --no-git-updateSam Thursfield2014-11-051-1/+3
* Fix synopsis of `morph edit` commandSam Thursfield2014-10-221-1/+1
* Fix `morph branch-from-image` to work for deployed imagesbaserock/richardmaw/bugfix/branch-from-deployed-imageRichard Maw2014-09-111-1/+2
* Merge branch 'baserock/richardmaw/misc-fixups'baserock/richardmaw/tmpRichard Maw2014-08-121-104/+15
|\
| * Fix `morph edit` when repo has the same ref as system branchRichard Maw2014-08-121-3/+11
| * Make morph show-branch-root print the pathRichard Maw2014-08-121-3/+4
| * Remove petrify and unpetrify commandsRichard Maw2014-08-121-98/+0
|/
* Use exact filenames to refer to morphology filesRichard Maw2014-07-101-2/+3
* Exorcise some old and unused commandsRichard Maw2014-07-071-1699/+536
* Allow tagging branches with null refsRichard Maw2014-02-131-27/+13
* plugins: Use new build command as defaultRichard Maw2013-11-291-1/+1
* Fix typoRichard Ipsum2013-11-061-1/+1
* Added scenario test for preventing building uncommitted systemsDaniel Firth2013-11-011-1/+8
* Building with references to tags will now instead use the underlying commitDaniel Firth2013-10-281-2/+3
* Tidy up debug output of morph buildDaniel Firth2013-10-281-1/+1
* build-without-push: Handle null repo/refRichard Maw2013-10-141-2/+2
* Merge remote-tracking branch 'origin/danielfirth/RT189'Lars Wirzenius2013-10-081-3/+0
|\
| * Dropped support for 'system-kind' from system morphology filesDan Firth2013-09-271-1/+0
| * Dropped support for 'disk-size' from system morphology files'Dan Firth2013-09-271-2/+0
* | B&M: refactor branch-from-imageRichard Maw2013-09-251-9/+3
|/
* b&m: Use new-status as the defaultRichard Maw2013-09-171-1/+1
* b&m: re-implement morph unpetrifyRichard Maw2013-09-051-1/+1
* b&m: Re-implement morph petrifyRichard Maw2013-09-051-1/+1
* b&m: Re-implement morph foreachRichard Maw2013-09-041-1/+1
* Revert "Merge branch 'liw/restore-old-cmds'"Richard Maw2013-08-291-163/+3
* Restore old branch and merge subcommandsLars Wirzenius2013-08-191-3/+163
* Add support for a `cluster` type of morphology.Tiago Gomes2013-08-161-1/+8
* Re-implement "morph edit" using new infrastructureLars Wirzenius2013-08-141-2/+2
* Re-implement "morph branch" using new infrastructureLars Wirzenius2013-08-061-42/+0
* Re-implement "morph show-branch-root" using new infrastructureLars Wirzenius2013-08-061-20/+0
* Re-implement "morph show-system-branch" using new infrastructureLars Wirzenius2013-08-061-8/+0
* Re-implement "morph checkout" using new infrastructureLars Wirzenius2013-08-061-37/+0
* Re-implement "morph workspace" using the Workspace classLars Wirzenius2013-07-311-7/+0
* Re-implement "morph init" using the new Workspace classLars Wirzenius2013-07-311-45/+0
* Add ARGS to the foreach argument synopsisTiago Gomes2013-07-221-2/+2
* Improve docstring for "morph tag"Lars Wirzenius2013-07-051-1/+22
* Improve docstring for "morph workspace"Lars Wirzenius2013-07-051-1/+1
* 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 foreach"Lars Wirzenius2013-07-051-1/+20
* Improve docstring for "morph edit"Lars Wirzenius2013-07-051-1/+59
* Improve docstring for "morph checkout"Lars Wirzenius2013-07-051-1/+19
* Improve docstring for "morph build"Lars Wirzenius2013-07-051-1/+25
* Improve docstring for "morph branch"Lars Wirzenius2013-07-051-1/+20