<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>
<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>
<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>
<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