diff options
Diffstat (limited to 'documentation/kernel-manual/kernel-how-to.xml')
| -rw-r--r-- | documentation/kernel-manual/kernel-how-to.xml | 2 |
1 files changed, 1 insertions, 1 deletions
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: <literallayout class='monospaced'> > 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 |