aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-send-pack.txt
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-10-08 06:45:03 +0000
committerJunio C Hamano <gitster@pobox.com>2023-10-09 12:04:21 -0700
commitcf6cac20059123d6ec3f867bb3692df62db52cf9 (patch)
tree99e0ee363183782b239257d69d28282c44100136 /Documentation/git-send-pack.txt
parent3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff)
downloadgit-cf6cac20059123d6ec3f867bb3692df62db52cf9.tar.gz
documentation: wording improvements
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-send-pack.txt')
-rw-r--r--Documentation/git-send-pack.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 595b002152..e76c262d7f 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -55,7 +55,7 @@ be in a separate packet, and the list must end with a flush packet.
--force::
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.
@@ -117,7 +117,7 @@ When one or more '<ref>' are specified explicitly (whether on the
command line or via `--stdin`), it can be either a
single pattern, or a pair of such pattern separated by a colon
":" (this means that a ref name cannot have a colon in it). A
-single pattern '<name>' is just a shorthand for '<name>:<name>'.
+single pattern '<name>' is just shorthand for '<name>:<name>'.
Each pattern pair consists of the source side (before the colon)
and the destination side (after the colon). The ref to be
@@ -143,9 +143,9 @@ name. See linkgit:git-rev-parse[1].
Without `--force`, 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.
+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.
With `--force`, the fast-forward check is disabled for all refs.