diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
| commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
| tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /git-pull.html | |
| parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
| download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz | |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/git-pull.html b/git-pull.html index 8b9e1ec17..61be7a31e 100644 --- a/git-pull.html +++ b/git-pull.html @@ -272,7 +272,7 @@ git-pull(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-pull</em> <options> <repository> <refspec>…</p>
+<p><em>git pull</em> <options> <repository> <refspec>…</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -1078,8 +1078,7 @@ the others will not be.</p> </li>
</ul>
<p>If you tried a pull which resulted in a complex conflicts and
-would want to start over, you can recover with
-<a href="git-reset.html">git-reset(1)</a>.</p>
+would want to start over, you can recover with <tt>git-reset</tt>.</p>
</div>
<h2>SEE ALSO</h2>
<div class="sectionbody">
@@ -1102,7 +1101,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 13-Jun-2008 10:02:42 UTC
+Last updated 02-Jul-2008 03:01:56 UTC
</div>
</div>
</body>
|