sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

documentation/dev-manual/dev-manual-newbie.xml: edits to Git section. 

(From yocto-docs rev: e5844ac3b29aa1206b4c08d9d4b4bb461f9db23b)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark 2011-07-22 09:28:10 -07:00 committed by Richard Purdie
parent f91f0c7fbb
commit 5c8f83592b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
documentation/dev-manual/dev-manual-newbie.xml
View File

@ -246,6 +246,9 @@
This way if you don’t like what you have done you can easily get rid of the work.</para></listitem>
<listitem><para><emphasis><filename>git branch</filename></emphasis> – Reports existing branches and
tells you which branch in which you are currently working.</para></listitem>
<listitem><para><emphasis><filename>git branch -D &lt;branch-name&gt;</filename></emphasis> –
Deletes an existing branch. You need to be in a branch other than the one you are deleting
in order to delete &lt;branch-name&gt;.</para></listitem>
<listitem><para><emphasis><filename>git pull</filename></emphasis> – 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</para></listitem>
<listitem><para><emphasis><filename>git cherry-pick</filename></emphasis> – Choose and apply specific
commits from one branch into another branch.