diff options
Diffstat (limited to 'git-pull.html')
-rw-r--r-- | git-pull.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/git-pull.html b/git-pull.html index 044fe1f89..c32ec00f8 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1268,7 +1268,7 @@ the current repository has the same history as the source repository.</p></div> <p>
By default when fetching from a shallow repository,
<code>git fetch</code> refuses refs that require updating
- .git/shallow. This option updates .git/shallow and accept such
+ .git/shallow. This option updates .git/shallow and accepts such
refs.
</p>
</dd>
@@ -1334,7 +1334,7 @@ precedence over the <code>fetch.output</code> config option.</p></div> </dt>
<dd>
<p>
- When <em>git fetch</em> is used with <code><src>:<dst></code> refspec it may
+ When <em>git fetch</em> is used with <code><src>:<dst></code> refspec, it may
refuse to update the local branch as discussed
in the <code><refspec></code> part of the <a href="git-fetch.html">git-fetch(1)</a>
documentation.
@@ -1600,14 +1600,14 @@ refspec (or <code>--force</code>).</p></div> <div class="paragraph"><p>Unlike when pushing with <a href="git-push.html">git-push(1)</a>, any updates outside of
<code>refs/{tags,heads}/*</code> will be accepted without <code>+</code> in the refspec (or
<code>--force</code>), 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.</p></div>
<div class="paragraph"><p>Unlike when pushing with <a href="git-push.html">git-push(1)</a>, there is no
configuration which’ll amend these rules, and nothing like a
<code>pre-fetch</code> hook analogous to the <code>pre-receive</code> hook.</p></div>
<div class="paragraph"><p>As with pushing with <a href="git-push.html">git-push(1)</a>, all of the rules described
above about what’s not allowed as an update can be overridden by
-adding an the optional leading <code>+</code> to a refspec (or using <code>--force</code>
+adding an optional leading <code>+</code> to a refspec (or using the <code>--force</code>
command line option). The only exception to this is that no amount of
forcing will make the <code>refs/heads/*</code> namespace accept a non-commit
object.</p></div>
@@ -1618,7 +1618,7 @@ object.</p></div> </td>
<td class="content">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 <code>+</code> sign to indicate non-fast-forward updates
@@ -1664,9 +1664,9 @@ is often useful.</td> address of the remote server, and the path to the repository.
Depending on the transport protocol, some of this information may be
absent.</p></div>
-<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
+<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp
and ftps can be used for fetching, but this is inefficient and
-deprecated; do not use it).</p></div>
+deprecated; do not use them).</p></div>
<div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
should be used with caution on unsecured networks.</p></div>
<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
@@ -1834,7 +1834,7 @@ config file would appear like this:</p></div> fetch = <refspec></code></pre>
</div></div>
<div class="paragraph"><p>The <code><pushurl></code> is used for pushes only. It is optional and defaults
-to <code><URL></code>. Pushing to a remote affects all defined pushurls or to all
+to <code><URL></code>. Pushing to a remote affects all defined pushurls or all
defined urls if no pushurls are defined. Fetch, however, will only
fetch from the first defined url if multiple urls are defined.</p></div>
</div>
@@ -1848,7 +1848,7 @@ provide a refspec on the command line. This file should have the following format:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code> URL: one of the above URL format
+<pre><code> URL: one of the above URL formats
Push: <refspec>
Pull: <refspec></code></pre>
</div></div>
|