diff options
author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /gitworkflows.html | |
parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'gitworkflows.html')
-rw-r--r-- | gitworkflows.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gitworkflows.html b/gitworkflows.html index 5d8d7365b..78a516295 100644 --- a/gitworkflows.html +++ b/gitworkflows.html @@ -659,7 +659,7 @@ history; downstream base their work on the official history.</p></div> </p>
</li>
</ul></div>
-<div class="para"><p>Note the last point. Do <em>not</em> use <em>git-pull</em> unless you actually want
+<div class="para"><p>Note the last point. Do <em>not</em> use <em>git pull</em> unless you actually want
to merge the remote branch.</p></div>
<div class="para"><p>Getting changes out is easy:</p></div>
<div class="exampleblock">
@@ -688,7 +688,7 @@ request to do so by mail. Such a request looks like</p></div> <pre><tt>Please pull from
<url> <branch></tt></pre>
</div></div>
-<div class="para"><p>In that case, <em>git-pull</em> can do the fetch and merge in one go, as
+<div class="para"><p>In that case, <em>git pull</em> can do the fetch and merge in one go, as
follows.</p></div>
<div class="exampleblock">
<div class="title">Recipe: Push/pull: Merging remote topics</div>
@@ -738,7 +738,7 @@ not published your topic other than by mail, so rebasing it is not a problem.</p></div>
<div class="para"><p>If you receive such a patch series (as maintainer, or perhaps as a
reader of the mailing list it was sent to), save the mails to files,
-create a new topic branch and use <em>git-am</em> to import the commits:</p></div>
+create a new topic branch and use <em>git am</em> to import the commits:</p></div>
<div class="exampleblock">
<div class="title">Recipe: format-patch/am: Importing patches</div>
<div class="exampleblock-content">
@@ -766,7 +766,7 @@ other options.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:56 UTC
+Last updated 2010-01-21 17:44:44 UTC
</div>
</div>
</body>
|