diff options
Diffstat (limited to 'documentation/kernel-manual')
| -rw-r--r-- | documentation/kernel-manual/kernel-how-to.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml index 6b70e5c4b..6b326b556 100644 --- a/documentation/kernel-manual/kernel-how-to.xml +++ b/documentation/kernel-manual/kernel-how-to.xml @@ -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 |