From 721a9340d63245199dc80f4e798f13d3b1fe8d74 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Tue, 8 Feb 2011 11:24:00 -0600 Subject: 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 --- documentation/kernel-manual/kernel-how-to.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'documentation') 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. # 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. For example, the following command pushes the changes from your local branch - common_pc-standard to the remote branch with the same name + common-pc-standard to the remote branch with the same name in the master repository //git.mycompany.com/pub/git/kernel-2.6.27. - > 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 @@ -866,9 +866,9 @@ repository. 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: - > git checkout common_pc-standard + > git checkout common-pc-standard > cd .. ; echo linux/.git > .cvsignore > cvs import -m "initial import" linux MY_COMPANY start @@ -881,7 +881,7 @@ repository. The following commands illustrate how you can condense and merge two BSPs into a second SCM: - > 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 -- cgit v1.2.3-54-g00ecf