documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Reversing common-pc-standard
[BUGID# 597] - After talking with Bruce Ashfield the kernel documentation needs to support the 2.6.34 disribution. So, the 'common-pc-standard' strings need to be changed back to 'common_pc-standard'. This fix restores them. Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
This commit is contained in:
parent
f8c5a63a25
commit
2a8c4a32be
|
@ -426,7 +426,7 @@ repository.
|
|||
<literallayout class='monospaced'>
|
||||
# full description of the changes
|
||||
> 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
|
||||
> git log --pretty=oneline --abbrev-commit <kernel type>..<bsp>-<kernel type>
|
||||
|
@ -733,10 +733,10 @@ repository.
|
|||
|
||||
<para>
|
||||
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>.
|
||||
<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>
|
||||
</para>
|
||||
|
||||
|
@ -866,9 +866,9 @@ repository.
|
|||
|
||||
<para>
|
||||
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'>
|
||||
> git checkout common-pc-standard
|
||||
> git checkout common_pc-standard
|
||||
> cd .. ; echo linux/.git > .cvsignore
|
||||
> cvs import -m "initial import" linux MY_COMPANY start
|
||||
</literallayout>
|
||||
|
@ -881,7 +881,7 @@ repository.
|
|||
<para>
|
||||
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 checkout common_pc-standard
|
||||
> git merge cav_ebt5800-standard
|
||||
# resolve any conflicts and commit them
|
||||
> cd .. ; echo linux/.git > .cvsignore
|
||||
|
|
Loading…
Reference in New Issue