From: Scott Rifenbark Date: Tue, 8 Feb 2011 19:48:13 +0000 (-0600) Subject: documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed. X-Git-Tag: 2011-1~2354^2~2 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=09e2aac993621fb1eaca8d1f7d150139472f7dae;p=openembedded-core.git documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed. The example used to show how to condense and merge two BSPs into a second SCM used a non-existant machine (cav_ebt5800-standard). I replaced this machine with 'common_pc_64-standard, which is a real machine. Signed-off-by: Scott Rifenbark --- diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml index 6b326b5561..01a78e685c 100644 --- a/documentation/kernel-manual/kernel-how-to.xml +++ b/documentation/kernel-manual/kernel-how-to.xml @@ -882,7 +882,7 @@ repository. The following commands illustrate how you can condense and merge two BSPs into a second SCM: > git checkout common_pc-standard - > git merge cav_ebt5800-standard + > git merge common_pc_64-standard # resolve any conflicts and commit them > cd .. ; echo linux/.git > .cvsignore > cvs import -m "initial import" linux MY_COMPANY start