diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2011-07-18 09:09:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-21 10:59:24 +0100 |
commit | a220e421f933cc82c5e33d85507e08a823415741 (patch) | |
tree | 50f1a93cf9487c012a508ca34a2fd5d499185061 /documentation/dev-manual/dev-manual-newbie.xml | |
parent | be0aaef24f2abc5112a05548fe0074beb8206f83 (diff) | |
download | poky-a220e421f933cc82c5e33d85507e08a823415741.tar.gz |
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>
Diffstat (limited to 'documentation/dev-manual/dev-manual-newbie.xml')
-rw-r--r-- | documentation/dev-manual/dev-manual-newbie.xml | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index 68a2f4a211..d4f94c0cf1 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml | |||
@@ -49,7 +49,7 @@ | |||
49 | 49 | ||
50 | <para> | 50 | <para> |
51 | Wikipedia has a good historical description of the Open Source Philosophy | 51 | Wikipedia has a good historical description of the Open Source Philosophy |
52 | <ulink url='http://wn.wikipedia.org/wiki/Open_source'>here</ulink>. | 52 | <ulink url='http://en.wikipedia.org/wiki/Open_source'>here</ulink>. |
53 | </para> | 53 | </para> |
54 | 54 | ||
55 | <para> | 55 | <para> |
@@ -204,50 +204,51 @@ | |||
204 | omits the many arguments they support. | 204 | omits the many arguments they support. |
205 | See the Git documentation for complete descriptions and strategies on how to use these commands: | 205 | See the Git documentation for complete descriptions and strategies on how to use these commands: |
206 | <itemizedlist> | 206 | <itemizedlist> |
207 | <listitem><para><emphasis>git init</emphasis> – Initializes an empty Git repository. | 207 | <listitem><para><emphasis><filename>git init</filename></emphasis> – Initializes an empty Git repository. |
208 | You cannot use Git commands unless you have a <filename>.git</filename> repository.</para></listitem> | 208 | You cannot use Git commands unless you have a <filename>.git</filename> repository.</para></listitem> |
209 | <listitem><para><emphasis>git clone</emphasis> – Creates a clone of a repository. | 209 | <listitem><para><emphasis><filename>git clone</filename></emphasis> – Creates a clone of a repository. |
210 | During collaboration this command allows you to create a local repository that is on | 210 | During collaboration this command allows you to create a local repository that is on |
211 | equal footing with a fellow developer’s repository.</para></listitem> | 211 | equal footing with a fellow developer’s repository.</para></listitem> |
212 | <listitem><para><emphasis>git add</emphasis> – Adds updated file contents to the index that | 212 | <listitem><para><emphasis><filename>git add</filename></emphasis> – Adds updated file contents to the index that |
213 | Git uses to track changes. | 213 | Git uses to track changes. |
214 | All files that have changed must be added before they can be committed.</para></listitem> | 214 | All files that have changed must be added before they can be committed.</para></listitem> |
215 | <listitem><para><emphasis>git commit</emphasis> – Creates a “commit” that documents the changes you made. | 215 | <listitem><para><emphasis><filename>git commit</filename></emphasis> – Creates a “commit” that documents |
216 | the changes you made. | ||
216 | Commits are used for historical purposes, for determining if a maintainer of a project | 217 | Commits are used for historical purposes, for determining if a maintainer of a project |
217 | will allow the change, and for ultimately pushing the change from your local Git repository | 218 | will allow the change, and for ultimately pushing the change from your local Git repository |
218 | into the project’s upstream (or master) repository.</para></listitem> | 219 | into the project’s upstream (or master) repository.</para></listitem> |
219 | <listitem><para><emphasis>git status</emphasis> – Reports any modified files that possibly need | 220 | <listitem><para><emphasis><filename>git status</filename></emphasis> – Reports any modified files that |
220 | added and committed.</para></listitem> | 221 | possibly need added and committed.</para></listitem> |
221 | <listitem><para><emphasis>git checkout <filename><branch-name></filename></emphasis> - Changes | 222 | <listitem><para><emphasis><filename>git checkout <branch-name></filename></emphasis> - Changes |
222 | your working branch. This command is analogous to “cd”.</para></listitem> | 223 | your working branch. This command is analogous to “cd”.</para></listitem> |
223 | <listitem><para><emphasis><filename>git checkout –b <working-branch></filename></emphasis> - Creates | 224 | <listitem><para><emphasis><filename>git checkout –b <working-branch></filename></emphasis> - Creates |
224 | a working branch on your local machine where you can isolate work. | 225 | a working branch on your local machine where you can isolate work. |
225 | It is a good idea to use local branches when adding specific features or changes. | 226 | It is a good idea to use local branches when adding specific features or changes. |
226 | This way if you don’t like what you have done you can easily get rid of the work.</para></listitem> | 227 | This way if you don’t like what you have done you can easily get rid of the work.</para></listitem> |
227 | <listitem><para><emphasis>git branch</emphasis> – Reports existing branches and tells you which | 228 | <listitem><para><emphasis><filename>git branch</filename></emphasis> – Reports existing branches and |
228 | branch in which you are currently working.</para></listitem> | 229 | tells you which branch in which you are currently working.</para></listitem> |
229 | <listitem><para><emphasis>git pull</emphasis> – Retrieves information from an upstream Git | 230 | <listitem><para><emphasis><filename>git pull</filename></emphasis> – Retrieves information from an upstream Git |
230 | repository and places it in your local Git repository. | 231 | repository and places it in your local Git repository. |
231 | You use this command to make sure you are synchronized with the upstream repository | 232 | You use this command to make sure you are synchronized with the upstream repository |
232 | from which the project’s maintainer uses to pull changes into the master repository.</para></listitem> | 233 | from which the project’s maintainer uses to pull changes into the master repository.</para></listitem> |
233 | <listitem><para><emphasis>git push</emphasis> – Sends all your local changes you have committed | 234 | <listitem><para><emphasis><filename>git push</filename></emphasis> – Sends all your local changes you |
234 | to an upstream Git repository. | 235 | have committed to an upstream Git repository. |
235 | The maintainer of the project draws from these repositories when adding your changes to the | 236 | The maintainer of the project draws from these repositories when adding your changes to the |
236 | project’s master repository.</para></listitem> | 237 | project’s master repository.</para></listitem> |
237 | <listitem><para><emphasis>git merge</emphasis> – Combines or adds changes from one local branch of | 238 | <listitem><para><emphasis><filename>git merge</filename></emphasis> – Combines or adds changes from one |
238 | your repository with another branch. | 239 | local branch of your repository with another branch. |
239 | When you create a local Git repository the default branch is named “master”. | 240 | When you create a local Git repository the default branch is named “master”. |
240 | A typical workflow is to create a temporary branch for isolated work, make and commit your | 241 | A typical workflow is to create a temporary branch for isolated work, make and commit your |
241 | changes, switch to the master branch, merge the changes in the temporary branch with the | 242 | changes, switch to the master branch, merge the changes in the temporary branch with the |
242 | master branch, and then delete the temporary branch</para></listitem> | 243 | master branch, and then delete the temporary branch</para></listitem> |
243 | <listitem><para><emphasis>git cherry-pick</emphasis> – Choose and apply specific commits from | 244 | <listitem><para><emphasis><filename>git cherry-pick</filename></emphasis> – Choose and apply specific |
244 | one branch into another branch. | 245 | commits from one branch into another branch. |
245 | There are times when you might not be able to merge all the changes in one branch with | 246 | There are times when you might not be able to merge all the changes in one branch with |
246 | another but need to pick out certain ones.</para></listitem> | 247 | another but need to pick out certain ones.</para></listitem> |
247 | <listitem><para><emphasis>gitk</emphasis> – Provides a GUI view of the branches and changes in | 248 | <listitem><para><emphasis><filename>gitk</filename></emphasis> – Provides a GUI view of the branches |
248 | your local Git repository. | 249 | and changes in your local Git repository. |
249 | This command is a good way to see where things have diverged in your local repository.</para></listitem> | 250 | This command is a good way to see where things have diverged in your local repository.</para></listitem> |
250 | <listitem><para><emphasis>git log</emphasis> – Reports a history of your changes to the | 251 | <listitem><para><emphasis><filename>git log</filename></emphasis> – Reports a history of your changes to the |
251 | repository.</para></listitem> | 252 | repository.</para></listitem> |
252 | </itemizedlist> | 253 | </itemizedlist> |
253 | </para> | 254 | </para> |