diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-23 12:00:42 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-23 12:00:42 +0000 |
| commit | 5aa1716e971a424dc1dbe6e4c69a36eb7c95e714 (patch) | |
| tree | e8048c98b10e5d5cf7339d859691cf16f53c5725 /doc | |
| parent | 2ff395757c6d0e5f48e0fbc57e90319e42197e8a (diff) | |
| download | morph-5aa1716e971a424dc1dbe6e4c69a36eb7c95e714.tar.gz | |
Add "morph merge" subcommand
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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/branching-merging-systems.mdwn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/branching-merging-systems.mdwn b/doc/branching-merging-systems.mdwn index 6fe4d590..3e781b5a 100644 --- a/doc/branching-merging-systems.mdwn +++ b/doc/branching-merging-systems.mdwn @@ -295,8 +295,9 @@ Usage: morph merge BRANCH -This needs to be run inside a system branch directory, and `BRANCH` -must be another system branch checked out in the morph mine. +This needs to be run inside a system branch directory's `morphs` +repository, and `BRANCH` must be another system branch checked out +in the morph mine. * In each git repository modified by the `BRANCH` system branch, run `git merge --no-commit BRANCH`, then undo any changes to |