summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-09-28 11:53:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-01 23:30:29 +0100
commit8606f28cb46cf185155a28434a9ba91daebce799 (patch)
treefbae3ac00e6c8cee4f88b372452ca70786e47f78 /documentation/dev-manual
parent78aedfa4d49c83d17d1a2e34c2bd8606044df07a (diff)
downloadpoky-8606f28cb46cf185155a28434a9ba91daebce799.tar.gz
documenation: dev-manual - clarifies local branch.
(From yocto-docs rev: fff80ac6e0a7092f19a268694f974ff45fb0fe8b) 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')
-rw-r--r--documentation/dev-manual/dev-manual-newbie.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 50e668a8e4..6954b9530d 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -680,8 +680,8 @@
680 existing local branches and 680 existing local branches and
681 tells you the branch in which you are currently working.</para></listitem> 681 tells you the branch in which you are currently working.</para></listitem>
682 <listitem><para><emphasis><filename>git branch -D &lt;branch-name&gt;</filename>:</emphasis> 682 <listitem><para><emphasis><filename>git branch -D &lt;branch-name&gt;</filename>:</emphasis>
683 Deletes an existing branch. 683 Deletes an existing local branch.
684 You need to be in a branch other than the one you are deleting 684 You need to be in a local branch other than the one you are deleting
685 in order to delete &lt;branch-name&gt;.</para></listitem> 685 in order to delete &lt;branch-name&gt;.</para></listitem>
686 <listitem><para><emphasis><filename>git pull</filename>:</emphasis> Retrieves information 686 <listitem><para><emphasis><filename>git pull</filename>:</emphasis> Retrieves information
687 from an upstream Git 687 from an upstream Git