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

documentation/dev-manual/dev-manual-newbie.xml: bad links corrected. (From yocto-docs rev: 77560db929ead2b4ce5cd04dd3a125b941cb4875) 

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-18 09:09:13 -07:00 committed by Richard Purdie
parent be0aaef24f
commit a220e421f9
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@
<para> <para>
Wikipedia has a good historical description of the Open Source Philosophy Wikipedia has a good historical description of the Open Source Philosophy
<ulink url='http://wn.wikipedia.org/wiki/Open_source'>here</ulink>. <ulink url='http://en.wikipedia.org/wiki/Open_source'>here</ulink>.
</para> </para>
<para> <para>
@ -204,50 +204,51 @@
omits the many arguments they support. omits the many arguments they support.
See the Git documentation for complete descriptions and strategies on how to use these commands: See the Git documentation for complete descriptions and strategies on how to use these commands:
<itemizedlist> <itemizedlist>
<listitem><para><emphasis>git init</emphasis> – Initializes an empty Git repository. <listitem><para><emphasis><filename>git init</filename></emphasis> – Initializes an empty Git repository.
You cannot use Git commands unless you have a <filename>.git</filename> repository.</para></listitem> You cannot use Git commands unless you have a <filename>.git</filename> repository.</para></listitem>
<listitem><para><emphasis>git clone</emphasis> – Creates a clone of a repository. <listitem><para><emphasis><filename>git clone</filename></emphasis> – Creates a clone of a repository.
During collaboration this command allows you to create a local repository that is on During collaboration this command allows you to create a local repository that is on
equal footing with a fellow developer’s repository.</para></listitem> equal footing with a fellow developer’s repository.</para></listitem>
<listitem><para><emphasis>git add</emphasis> – Adds updated file contents to the index that <listitem><para><emphasis><filename>git add</filename></emphasis> – Adds updated file contents to the index that
Git uses to track changes. Git uses to track changes.
All files that have changed must be added before they can be committed.</para></listitem> All files that have changed must be added before they can be committed.</para></listitem>
<listitem><para><emphasis>git commit</emphasis> – Creates a “commit” that documents the changes you made. <listitem><para><emphasis><filename>git commit</filename></emphasis> – Creates a “commit” that documents
the changes you made.
Commits are used for historical purposes, for determining if a maintainer of a project Commits are used for historical purposes, for determining if a maintainer of a project
will allow the change, and for ultimately pushing the change from your local Git repository will allow the change, and for ultimately pushing the change from your local Git repository
into the project’s upstream (or master) repository.</para></listitem> into the project’s upstream (or master) repository.</para></listitem>
<listitem><para><emphasis>git status</emphasis> – Reports any modified files that possibly need <listitem><para><emphasis><filename>git status</filename></emphasis> – Reports any modified files that
added and committed.</para></listitem> possibly need added and committed.</para></listitem>
<listitem><para><emphasis>git checkout <filename>&lt;branch-name&gt;</filename></emphasis> - Changes <listitem><para><emphasis><filename>git checkout &lt;branch-name&gt;</filename></emphasis> - Changes
your working branch. This command is analogous to “cd”.</para></listitem> your working branch. This command is analogous to “cd”.</para></listitem>
<listitem><para><emphasis><filename>git checkout –b &lt;working-branch&gt;</filename></emphasis> - Creates <listitem><para><emphasis><filename>git checkout –b &lt;working-branch&gt;</filename></emphasis> - Creates
a working branch on your local machine where you can isolate work. a working branch on your local machine where you can isolate work.
It is a good idea to use local branches when adding specific features or changes. It is a good idea to use local branches when adding specific features or changes.
This way if you don’t like what you have done you can easily get rid of the work.</para></listitem> This way if you don’t like what you have done you can easily get rid of the work.</para></listitem>
<listitem><para><emphasis>git branch</emphasis> – Reports existing branches and tells you which <listitem><para><emphasis><filename>git branch</filename></emphasis> – Reports existing branches and
branch in which you are currently working.</para></listitem> tells you which branch in which you are currently working.</para></listitem>
<listitem><para><emphasis>git pull</emphasis> – Retrieves information from an upstream Git <listitem><para><emphasis><filename>git pull</filename></emphasis> – Retrieves information from an upstream Git
repository and places it in your local Git repository. repository and places it in your local Git repository.
You use this command to make sure you are synchronized with the upstream repository You use this command to make sure you are synchronized with the upstream repository
from which the project’s maintainer uses to pull changes into the master repository.</para></listitem> from which the project’s maintainer uses to pull changes into the master repository.</para></listitem>
<listitem><para><emphasis>git push</emphasis> – Sends all your local changes you have committed <listitem><para><emphasis><filename>git push</filename></emphasis> – Sends all your local changes you
to an upstream Git repository. have committed to an upstream Git repository.
The maintainer of the project draws from these repositories when adding your changes to the The maintainer of the project draws from these repositories when adding your changes to the
project’s master repository.</para></listitem> project’s master repository.</para></listitem>
<listitem><para><emphasis>git merge</emphasis> – Combines or adds changes from one local branch of <listitem><para><emphasis><filename>git merge</filename></emphasis> – Combines or adds changes from one
your repository with another branch. local branch of your repository with another branch.
When you create a local Git repository the default branch is named “master”. 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 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 in the temporary branch with the
master branch, and then delete the temporary branch</para></listitem> master branch, and then delete the temporary branch</para></listitem>
<listitem><para><emphasis>git cherry-pick</emphasis> – Choose and apply specific commits from <listitem><para><emphasis><filename>git cherry-pick</filename></emphasis> – Choose and apply specific
one branch into another branch. commits from one branch into another branch.
There are times when you might not be able to merge all the changes in one branch with There are times when you might not be able to merge all the changes in one branch with
another but need to pick out certain ones.</para></listitem> another but need to pick out certain ones.</para></listitem>
<listitem><para><emphasis>gitk</emphasis> – Provides a GUI view of the branches and changes in <listitem><para><emphasis><filename>gitk</filename></emphasis> – Provides a GUI view of the branches
your local Git repository. and changes in your local Git repository.
This command is a good way to see where things have diverged in your local repository.</para></listitem> This command is a good way to see where things have diverged in your local repository.</para></listitem>
<listitem><para><emphasis>git log</emphasis> – Reports a history of your changes to the <listitem><para><emphasis><filename>git log</filename></emphasis> – Reports a history of your changes to the
repository.</para></listitem> repository.</para></listitem>
</itemizedlist> </itemizedlist>
</para> </para>