From 5c8f83592bff30bdc0ee3725a9ba1f9358189a0c Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Fri, 22 Jul 2011 09:28:10 -0700 Subject: documentation/dev-manual/dev-manual-newbie.xml: edits to Git section. (From yocto-docs rev: e5844ac3b29aa1206b4c08d9d4b4bb461f9db23b) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/dev-manual/dev-manual-newbie.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'documentation/dev-manual/dev-manual-newbie.xml') diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index c39024cd3f..57079fa0c5 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml @@ -246,6 +246,9 @@ This way if you don’t like what you have done you can easily get rid of the work. git branch – Reports existing branches and tells you which branch in which you are currently working. + git branch -D <branch-name> – + Deletes an existing branch. You need to be in a branch other than the one you are deleting + in order to delete <branch-name>. git pull – Retrieves information from an upstream Git repository and places it in your local Git repository. You use this command to make sure you are synchronized with the upstream repository @@ -258,7 +261,7 @@ local branch of your repository with another branch. When you create a local Git repository the default branch is named “master”. A typical workflow is to create a temporary branch for isolated work, make and commit your - changes, switch to the master branch, merge the changes in the temporary branch with the + changes, switch to the master branch, merge the changes from the temporary branch into the master branch, and then delete the temporary branch git cherry-pick – Choose and apply specific commits from one branch into another branch. -- cgit v1.2.3-54-g00ecf