documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Fixed common_pc
[BUGID# 597] - Changed the string "common_pc" to "common-pc". Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
This commit is contained in:
parent
6cb8fd6def
commit
721a9340d6
|
@ -426,7 +426,7 @@ repository.
|
||||||
<literallayout class='monospaced'>
|
<literallayout class='monospaced'>
|
||||||
# full description of the changes
|
# full description of the changes
|
||||||
> git whatchanged <kernel type>..<bsp>-<kernel type>
|
> git whatchanged <kernel type>..<bsp>-<kernel type>
|
||||||
> eg: git whatchanged standard..common_pc-standard
|
> eg: git whatchanged standard..common-pc-standard
|
||||||
|
|
||||||
# summary of the changes
|
# summary of the changes
|
||||||
> git log --pretty=oneline --abbrev-commit <kernel type>..<bsp>-<kernel type>
|
> git log --pretty=oneline --abbrev-commit <kernel type>..<bsp>-<kernel type>
|
||||||
|
@ -733,10 +733,10 @@ repository.
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
For example, the following command pushes the changes from your local branch
|
For example, the following command pushes the changes from your local branch
|
||||||
<filename>common_pc-standard</filename> to the remote branch with the same name
|
<filename>common-pc-standard</filename> to the remote branch with the same name
|
||||||
in the master repository <filename>//git.mycompany.com/pub/git/kernel-2.6.27</filename>.
|
in the master repository <filename>//git.mycompany.com/pub/git/kernel-2.6.27</filename>.
|
||||||
<literallayout class='monospaced'>
|
<literallayout class='monospaced'>
|
||||||
> push ssh://git.mycompany.com/pub/git/kernel-2.6.27 common_pc-standard:common_pc-standard
|
> push ssh://git.mycompany.com/pub/git/kernel-2.6.27 common-pc-standard:common-pc-standard
|
||||||
</literallayout>
|
</literallayout>
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
@ -866,9 +866,9 @@ repository.
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
The following commands illustrate some of the steps you could use to
|
The following commands illustrate some of the steps you could use to
|
||||||
import the common_pc-standard kernel into a secondary SCM:
|
import the common-pc-standard kernel into a secondary SCM:
|
||||||
<literallayout class='monospaced'>
|
<literallayout class='monospaced'>
|
||||||
> git checkout common_pc-standard
|
> git checkout common-pc-standard
|
||||||
> cd .. ; echo linux/.git > .cvsignore
|
> cd .. ; echo linux/.git > .cvsignore
|
||||||
> cvs import -m "initial import" linux MY_COMPANY start
|
> cvs import -m "initial import" linux MY_COMPANY start
|
||||||
</literallayout>
|
</literallayout>
|
||||||
|
@ -881,7 +881,7 @@ repository.
|
||||||
<para>
|
<para>
|
||||||
The following commands illustrate how you can condense and merge two BSPs into a second SCM:
|
The following commands illustrate how you can condense and merge two BSPs into a second SCM:
|
||||||
<literallayout class='monospaced'>
|
<literallayout class='monospaced'>
|
||||||
> git checkout common_pc-standard
|
> git checkout common-pc-standard
|
||||||
> git merge cav_ebt5800-standard
|
> git merge cav_ebt5800-standard
|
||||||
# resolve any conflicts and commit them
|
# resolve any conflicts and commit them
|
||||||
> cd .. ; echo linux/.git > .cvsignore
|
> cd .. ; echo linux/.git > .cvsignore
|
||||||
|
|
Loading…
Reference in New Issue