summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-04-09 14:43:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-10 16:20:56 +0100
commit78ec6f7c076e95448ca0f136031be2042f72a5b2 (patch)
tree0d61114a7cd1ef2471d338faf96d7ce308290122 /documentation
parentf1c2fea3f82c4b63a22d280f508dd32559d0cebe (diff)
downloadast2050-yocto-poky-78ec6f7c076e95448ca0f136031be2042f72a5b2.zip
ast2050-yocto-poky-78ec6f7c076e95448ca0f136031be2042f72a5b2.tar.gz
dev-manual: Edits to "Basic Commands" section.
(From yocto-docs rev: 3cd5c68d610d7ec2fe4c8d1ad64b05833bb31425) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/dev-manual/dev-manual-newbie.xml27
1 files changed, 15 insertions, 12 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index b42fafd..a365e07 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -992,7 +992,7 @@
</para>
<para>
- If you don’t know much about Git, we suggest you educate
+ If you don’t know much about Git, you should educate
yourself by visiting the links previously mentioned.
</para>
@@ -1007,24 +1007,24 @@
<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
equal footing with a fellow developer’s repository.</para></listitem>
- <listitem><para><emphasis><filename>git add</filename>:</emphasis> Adds updated file contents
+ <listitem><para><emphasis><filename>git add</filename>:</emphasis> Stages updated file contents
to the index that
Git uses to track changes.
- You must add all files that have changed before you can commit them.</para></listitem>
- <listitem><para><emphasis><filename>git commit</filename>:</emphasis> Creates a “commit” that documents
+ You must stage all files that have changed before you can commit them.</para></listitem>
+ <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
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>
<listitem><para><emphasis><filename>git status</filename>:</emphasis> Reports any modified files that
- possibly need to be added and committed.</para></listitem>
+ possibly need staged and committed.</para></listitem>
<listitem><para><emphasis><filename>git checkout &lt;branch-name&gt;</filename>:</emphasis> Changes
your working branch.
- This command is analogous to “cd”.</para></listitem>
+ This command is analogous to "cd".</para></listitem>
<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.
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 do not 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 local branches and
tells you the branch in which you are currently working.</para></listitem>
@@ -1037,13 +1037,16 @@
repository and places it in your local Git repository.
You use this command to make sure you are synchronized with the repository
from which you are basing changes (.e.g. the master branch).</para></listitem>
- <listitem><para><emphasis><filename>git push</filename>:</emphasis> Sends all your local changes you
- have committed to an upstream Git repository (e.g. a contribution repository).
- The maintainer of the project draws from these repositories when adding your changes to the
- project’s master repository.</para></listitem>
+ <listitem><para><emphasis><filename>git push</filename>:</emphasis>
+ Sends all your committed local changes to an upstream Git
+ repository (e.g. a contribution repository).
+ The maintainer of the project draws from these repositories
+ when adding changes to the project’s master repository or
+ other development branch.
+ </para></listitem>
<listitem><para><emphasis><filename>git merge</filename>:</emphasis> Combines or adds changes from one
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
changes, switch to your local master branch, merge the changes from the temporary branch into the
local master branch, and then delete the temporary branch.</para></listitem>
OpenPOWER on IntegriCloud