diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
commit | 3f680f3f3b57189c755ddb5f3c7f099ddab1b221 (patch) | |
tree | 2a5e1f1d44ea53e5d9fa7ebcf56d558feac065c7 /git-pull.html | |
parent | e1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff) | |
download | git-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz |
Autogenerated HTML docs for v1.6.5.2-215-g77097f
Diffstat (limited to 'git-pull.html')
-rw-r--r-- | git-pull.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-pull.html b/git-pull.html index 500f6812f..d4cf749a4 100644 --- a/git-pull.html +++ b/git-pull.html @@ -639,9 +639,9 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> </p>
<div class="para"><p>The remote ref that matches <src>
is fetched, and if <dst> is not empty string, the local
-ref that matches it is fast forwarded using <src>.
+ref that matches it is fast-forwarded using <src>.
If the optional plus <tt>+</tt> is used, the local ref
-is updated even if it does not result in a fast forward
+is updated even if it does not result in a fast-forward
update.</p></div>
<div class="admonitionblock">
<table><tr>
@@ -1121,7 +1121,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-15 09:57:15 UTC
+Last updated 2009-11-16 02:10:13 UTC
</div>
</div>
</body>
|