summaryrefslogtreecommitdiffstats
path: root/git-send-pack.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-11-16 02:10:54 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-11-16 02:10:54 +0000
commit3f680f3f3b57189c755ddb5f3c7f099ddab1b221 (patch)
tree2a5e1f1d44ea53e5d9fa7ebcf56d558feac065c7 /git-send-pack.html
parente1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff)
downloadgit-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz
Autogenerated HTML docs for v1.6.5.2-215-g77097f
Diffstat (limited to 'git-send-pack.html')
-rw-r--r--git-send-pack.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-send-pack.html b/git-send-pack.html
index 826d2762b..2aad49c23 100644
--- a/git-send-pack.html
+++ b/git-send-pack.html
@@ -480,10 +480,10 @@ it has to start with "refs/"; &lt;dst&gt; is used as the
</ul></div>
<div class="para"><p>Without <em>--force</em>, the &lt;src&gt; ref is stored at the remote only if
&lt;dst&gt; does not exist, or &lt;dst&gt; is a proper subset (i.e. an
-ancestor) of &lt;src&gt;. This check, known as "fast forward check",
+ancestor) of &lt;src&gt;. This check, known as "fast-forward check",
is performed in order to avoid accidentally overwriting the
remote ref and lose other peoples' commits from there.</p></div>
-<div class="para"><p>With <em>--force</em>, the fast forward check is disabled for all refs.</p></div>
+<div class="para"><p>With <em>--force</em>, the fast-forward check is disabled for all refs.</p></div>
<div class="para"><p>Optionally, a &lt;ref&gt; parameter can be prefixed with a plus <em>+</em> sign
to disable the fast-forward check only on that ref.</p></div>
</div>
@@ -501,7 +501,7 @@ to disable the fast-forward check only on that ref.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-15 09:57:19 UTC
+Last updated 2009-11-16 02:10:14 UTC
</div>
</div>
</body>