From 5aa1716e971a424dc1dbe6e4c69a36eb7c95e714 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 23 Mar 2012 12:00:42 +0000 Subject: 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. --- doc/branching-merging-systems.mdwn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'doc/branching-merging-systems.mdwn') 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 -- cgit v1.2.1