From 42a9a5077175be522470c9a07a4ef0045e76acac Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Wed, 25 Apr 2012 10:54:34 -0600 Subject: documentation/dev-manual/dev-manual-newbie.xml: Tag example fixed The example that creates a local branch based on a release tag in the "Repositories, Tags, and Branches" section was not optimal. Darren Hart informed me that naming a local branch the same name as a tag confuses Git. Plus, the "-b" option was mis-placed. Renamed the local branch to have "my-" in front of it and moved the "-b" option earlier in the command. (From yocto-docs rev: 24ab16d18fb317efb86d2c4ddb2ac1a1449df519) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/dev-manual/dev-manual-newbie.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'documentation') diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index 7dfedd93b0..1f41d1e935 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml @@ -579,14 +579,14 @@ $ cd ~ $ git clone git://git.yoctoproject.org/poky $ cd poky - $ git checkout &DISTRO_NAME;-&POKYVERSION; -b &DISTRO_NAME;-&POKYVERSION; + $ git checkout -b my-&DISTRO_NAME;-&POKYVERSION; &DISTRO_NAME;-&POKYVERSION; In this example, the name of the top-level directory of your local Yocto Project Files Git repository is poky. And, the name of the local branch you have created and checked out is - &DISTRO_NAME;-&POKYVERSION;. + my-&DISTRO_NAME;-&POKYVERSION;. The files in your repository now exactly match the Yocto Project &DISTRO; - Release tag (&DISTRO_NAME;). + Release tag (&DISTRO_NAME;-&POKYVERSION;). It is important to understand that when you create and checkout a local working branch based on a tag, your environment matches a specific point in time and not a development branch. -- cgit v1.2.3-54-g00ecf