diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-07-04 13:15:15 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-07-05 14:35:46 +0000 |
commit | b2c4e13664209cffc9c0d58bb842e2e90a6e0c32 (patch) | |
tree | dc9562e9cba986030e54ac0f1ba9f2bc424e096a /morphlib/plugins/branch_and_merge_plugin.py | |
parent | 52d3f3dae9b96a86070292e7f49af8a635aff323 (diff) | |
download | morph-b2c4e13664209cffc9c0d58bb842e2e90a6e0c32.tar.gz |
Improve docstring for "morph merge"
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
-rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index a6e3ad78..de87bbda 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -1460,8 +1460,20 @@ class BranchAndMergePlugin(cliapp.Plugin): def merge(self, args): '''Pull and merge changes from a system branch into the current one. - The remote branch is pulled from the current workspace into the target - repositories (so any local commits are included). + Command line arguments: + + * `BRANCH` is the name of the system branch to merge _from_. + + This merges another system branch into the current one. Morph + will do a `git merge` for each component that has been edited, + and undo any changes to `ref` fields in system and stratum + morphologies that `morph edit` has made. + + You need to be in the _target_ system branch when merging. If + you have two system branches, `TROVE_ID/release/1.2` and + `TROVE_ID/bugfixes/12765`, and want to merge the bug fix branch + into the release branch, you need to first checkout the release + system branch, and then merge the bugfix branch into that. ''' |