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 6b326b5561..6b70e5c4b7 100644 --- a/documentation/kernel-manual/kernel-how-to.xml +++ b/documentation/kernel-manual/kernel-how-to.xml | |||
@@ -426,7 +426,7 @@ repository. | |||
426 | <literallayout class='monospaced'> | 426 | <literallayout class='monospaced'> |
427 | # full description of the changes | 427 | # full description of the changes |
428 | > git whatchanged <kernel type>..<bsp>-<kernel type> | 428 | > git whatchanged <kernel type>..<bsp>-<kernel type> |
429 | > eg: git whatchanged standard..common_pc-standard | 429 | > eg: git whatchanged standard..common-pc-standard |
430 | 430 | ||
431 | # summary of the changes | 431 | # summary of the changes |
432 | > git log --pretty=oneline --abbrev-commit <kernel type>..<bsp>-<kernel type> | 432 | > git log --pretty=oneline --abbrev-commit <kernel type>..<bsp>-<kernel type> |
@@ -733,10 +733,10 @@ repository. | |||
733 | 733 | ||
734 | <para> | 734 | <para> |
735 | For example, the following command pushes the changes from your local branch | 735 | For example, the following command pushes the changes from your local branch |
736 | <filename>common_pc-standard</filename> to the remote branch with the same name | 736 | <filename>common-pc-standard</filename> to the remote branch with the same name |
737 | in the master repository <filename>//git.mycompany.com/pub/git/kernel-2.6.27</filename>. | 737 | in the master repository <filename>//git.mycompany.com/pub/git/kernel-2.6.27</filename>. |
738 | <literallayout class='monospaced'> | 738 | <literallayout class='monospaced'> |
739 | > push ssh://git.mycompany.com/pub/git/kernel-2.6.27 common_pc-standard:common_pc-standard | 739 | > push ssh://git.mycompany.com/pub/git/kernel-2.6.27 common-pc-standard:common-pc-standard |
740 | </literallayout> | 740 | </literallayout> |
741 | </para> | 741 | </para> |
742 | 742 | ||
@@ -866,9 +866,9 @@ repository. | |||
866 | 866 | ||
867 | <para> | 867 | <para> |
868 | The following commands illustrate some of the steps you could use to | 868 | The following commands illustrate some of the steps you could use to |
869 | import the common_pc-standard kernel into a secondary SCM: | 869 | import the common-pc-standard kernel into a secondary SCM: |
870 | <literallayout class='monospaced'> | 870 | <literallayout class='monospaced'> |
871 | > git checkout common_pc-standard | 871 | > git checkout common-pc-standard |
872 | > cd .. ; echo linux/.git > .cvsignore | 872 | > cd .. ; echo linux/.git > .cvsignore |
873 | > cvs import -m "initial import" linux MY_COMPANY start | 873 | > cvs import -m "initial import" linux MY_COMPANY start |
874 | </literallayout> | 874 | </literallayout> |
@@ -881,7 +881,7 @@ repository. | |||
881 | <para> | 881 | <para> |
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 | > git checkout common_pc-standard | 884 | > git checkout common-pc-standard |
885 | > git merge cav_ebt5800-standard | 885 | > git merge cav_ebt5800-standard |
886 | # resolve any conflicts and commit them | 886 | # resolve any conflicts and commit them |
887 | > cd .. ; echo linux/.git > .cvsignore | 887 | > cd .. ; echo linux/.git > .cvsignore |