summaryrefslogtreecommitdiffstats
path: root/documentation/kernel-manual/kernel-how-to.xml
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/kernel-manual/kernel-how-to.xml')
-rw-r--r--documentation/kernel-manual/kernel-how-to.xml2
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.
882 The following commands illustrate how you can condense and merge two BSPs into a second SCM: 882 The following commands illustrate how you can condense and merge two BSPs into a second SCM:
883 <literallayout class='monospaced'> 883 <literallayout class='monospaced'>
884 &gt; git checkout common_pc-standard 884 &gt; git checkout common_pc-standard
885 &gt; git merge cav_ebt5800-standard 885 &gt; git merge common_pc_64-standard
886 # resolve any conflicts and commit them 886 # resolve any conflicts and commit them
887 &gt; cd .. ; echo linux/.git &gt; .cvsignore 887 &gt; cd .. ; echo linux/.git &gt; .cvsignore
888 &gt; cvs import -m "initial import" linux MY_COMPANY start 888 &gt; cvs import -m "initial import" linux MY_COMPANY start