diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 16:18:36 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 16:18:36 -0800 |
commit | 52b1cfba6ed4a0278108ca4deaf3f7646abd1fbb (patch) | |
tree | d192843d5b628529a7b62665db83e4e79e1c347d /gitcore-tutorial.html | |
parent | 18a1532395f7adb2f9972cdc8551b3fa13f2a4a4 (diff) | |
download | git-htmldocs-52b1cfba6ed4a0278108ca4deaf3f7646abd1fbb.tar.gz |
Autogenerated HTML docs for v2.11.0-161-g6610a
Diffstat (limited to 'gitcore-tutorial.html')
-rw-r--r-- | gitcore-tutorial.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 24131b6fb..515f06fa2 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html @@ -763,7 +763,7 @@ you want to understand Git’s internals.</p></div> <div class="paragraph"><p>The core Git is often called "plumbing", with the prettier user
interfaces on top of it called "porcelain". You may not want to use the
plumbing directly very often, but it can be good to know what the
-plumbing does for when the porcelain isn’t flushing.</p></div>
+plumbing does when the porcelain isn’t flushing.</p></div>
<div class="paragraph"><p>Back when this document was originally written, many porcelain
commands were shell scripts. For simplicity, it still uses them as
examples to illustrate how plumbing is fit together to form the
@@ -2104,7 +2104,7 @@ storage by "packing them together". The command</p></div> <div class="paragraph"><p>will do it for you. If you followed the tutorial examples, you
would have accumulated about 17 objects in <code>.git/objects/??/</code>
directories by now. <em>git repack</em> tells you how many objects it
-packed, and stores the packed file in <code>.git/objects/pack</code>
+packed, and stores the packed file in the <code>.git/objects/pack</code>
directory.</p></div>
<div class="admonitionblock">
<table><tr>
@@ -2237,7 +2237,7 @@ on that project and has an own "public repository" goes like this:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-Prepare your work repository, by <em>git clone</em> the public
+Prepare your work repository, by running <em>git clone</em> on the public
repository of the "project lead". The URL used for the
initial cloning is stored in the remote.origin.url
configuration variable.
@@ -2337,9 +2337,9 @@ Use <code>git format-patch origin</code> to prepare patches for e-mail <div class="sect1">
<h2 id="_working_with_others_shared_repository_style">Working with Others, Shared Repository Style</h2>
<div class="sectionbody">
-<div class="paragraph"><p>If you are coming from CVS background, the style of cooperation
+<div class="paragraph"><p>If you are coming from a CVS background, the style of cooperation
suggested in the previous section may be new to you. You do not
-have to worry. Git supports "shared public repository" style of
+have to worry. Git supports the "shared public repository" style of
cooperation you are probably more familiar with as well.</p></div>
<div class="paragraph"><p>See <a href="gitcvs-migration.html">gitcvs-migration(7)</a> for the details.</p></div>
</div>
@@ -2423,7 +2423,7 @@ $ git show-branch * [master~1] Release candidate #1
++* [master~2] Pretty-print messages.</code></pre>
</div></div>
-<div class="paragraph"><p>Note that you should not do Octopus because you can. An octopus
+<div class="paragraph"><p>Note that you should not do Octopus just because you can. An octopus
is a valid thing to do and often makes it easier to view the
commit history if you are merging more than two independent
changes at the same time. However, if you have merge conflicts
@@ -2457,7 +2457,7 @@ to follow, not easier.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-07-13 14:58:50 PDT
+Last updated 2016-12-19 16:18:00 PST
</div>
</div>
</body>
|