summaryrefslogtreecommitdiffstats
path: root/pull-fetch-param.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:54 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:54 -0700
commit33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch)
tree4a681cad5c6da23a7d7f56022666fb31397026d2 /pull-fetch-param.txt
parent359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff)
downloadgit-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'pull-fetch-param.txt')
-rw-r--r--pull-fetch-param.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/pull-fetch-param.txt b/pull-fetch-param.txt
index 95a7390b2..c718f7946 100644
--- a/pull-fetch-param.txt
+++ b/pull-fetch-param.txt
@@ -71,7 +71,7 @@ refspec (or `--force`).
Unlike when pushing with linkgit:git-push[1], any updates outside of
`refs/{tags,heads}/*` will be accepted without `+` in the refspec (or
`--force`), whether that's swapping e.g. a tree object for a blob, or
-a commit for another commit that's doesn't have the previous commit as
+a commit for another commit that doesn't have the previous commit as
an ancestor etc.
+
Unlike when pushing with linkgit:git-push[1], there is no
@@ -80,7 +80,7 @@ configuration which'll amend these rules, and nothing like a
+
As with pushing with linkgit:git-push[1], all of the rules described
above about what's not allowed as an update can be overridden by
-adding an the optional leading `+` to a refspec (or using `--force`
+adding an optional leading `+` to a refspec (or using the `--force`
command line option). The only exception to this is that no amount of
forcing will make the `refs/heads/*` namespace accept a non-commit
object.
@@ -88,7 +88,7 @@ object.
[NOTE]
When the remote branch you want to fetch is known to
be rewound and rebased regularly, it is expected that
-its new tip will not be descendant of its previous tip
+its new tip will not be a descendant of its previous tip
(as stored in your remote-tracking branch the last time
you fetched). You would want
to use the `+` sign to indicate non-fast-forward updates