diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
commit | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch) | |
tree | 4a681cad5c6da23a7d7f56022666fb31397026d2 /git-send-pack.html | |
parent | 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff) | |
download | git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz |
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'git-send-pack.html')
-rw-r--r-- | git-send-pack.html | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/git-send-pack.html b/git-send-pack.html index c4354c91c..7fe9e63d2 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -828,7 +828,7 @@ be in a separate packet, and the list must end with a flush packet.</p></div> <p>
Usually, the command refuses to update a remote ref that
is not an ancestor of the local ref used to overwrite it.
- This flag disables the check. What this means is that
+ This flag disables the check. This means that
the remote repository can lose commits; use it with
care.
</p>
@@ -923,16 +923,16 @@ be in a separate packet, and the list must end with a flush packet.</p></div> <div class="sectionbody">
<div class="paragraph"><p>There are three ways to specify which refs to update on the
remote end.</p></div>
-<div class="paragraph"><p>With <code>--all</code> flag, all refs that exist locally are transferred to
+<div class="paragraph"><p>With the <code>--all</code> flag, all refs that exist locally are transferred to
the remote side. You cannot specify any <em><ref></em> if you use
this flag.</p></div>
<div class="paragraph"><p>Without <code>--all</code> and without any <em><ref></em>, the heads that exist
both on the local side and on the remote side are updated.</p></div>
<div class="paragraph"><p>When one or more <em><ref></em> are specified explicitly (whether on the
command line or via <code>--stdin</code>), it can be either a
-single pattern, or a pair of such pattern separated by a colon
+single pattern, or a pair of such patterns separated by a colon
":" (this means that a ref name cannot have a colon in it). A
-single pattern <em><name></em> is just a shorthand for <em><name>:<name></em>.</p></div>
+single pattern <em><name></em> is just shorthand for <em><name>:<name></em>.</p></div>
<div class="paragraph"><p>Each pattern pair consists of the source side (before the colon)
and the destination side (after the colon). The ref to be
pushed is determined by finding a match that matches the source
@@ -949,7 +949,7 @@ It is an error if <src> does not match exactly one of the </li>
<li>
<p>
-It is an error if <dst> matches more than one remote refs.
+It is an error if <dst> matches more than one remote ref.
</p>
</li>
<li>
@@ -973,11 +973,11 @@ it has to start with "refs/"; <dst> is used as the </ul></div>
</li>
</ul></div>
-<div class="paragraph"><p>Without ‘--force`, the <src> ref is stored at the remote only if
+<div class="paragraph"><p>Without <code>--force</code>, the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an
-ancestor) of <src>. 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>
+ancestor) of <src>. This check, known as the "fast-forward check",
+is performed to avoid accidentally overwriting the
+remote ref and losing other people’s commits from there.</p></div>
<div class="paragraph"><p>With <code>--force</code>, the fast-forward check is disabled for all refs.</p></div>
<div class="paragraph"><p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign
to disable the fast-forward check only on that ref.</p></div>
@@ -994,7 +994,7 @@ to disable the fast-forward check only on that ref.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
|