summaryrefslogtreecommitdiffstats
path: root/git-push.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-07-09 20:38:54 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-07-09 20:38:54 +0000
commit51c2ab075b2b9f9af2734cb54753534bbda88696 (patch)
treecbb8b80ebc6d46add639113a939902f94f2f9d0a /git-push.html
parentc26f5488a78cd9e6bdcc963590ca3a5895877906 (diff)
downloadgit-htmldocs-51c2ab075b2b9f9af2734cb54753534bbda88696.tar.gz
Autogenerated HTML docs for v1.4.1-gff4c8
Diffstat (limited to 'git-push.html')
-rw-r--r--git-push.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-push.html b/git-push.html
index 68be21fc5..ca710d34c 100644
--- a/git-push.html
+++ b/git-push.html
@@ -358,7 +358,7 @@ A parameter &lt;ref&gt; without a colon is equivalent to
<dd>
<p>
Usually, the command refuses to update a remote ref that is
- not a descendent of the local ref used to overwrite it.
+ not a descendant of the local ref used to overwrite it.
This flag disables the check. This can cause the
remote repository to lose commits; use it with care.
</p>
@@ -465,7 +465,7 @@ Pull: &lt;refspec&gt;</tt></pre>
&lt;repository&gt; without &lt;refspec&gt; parameters on the command
line, &lt;refspec&gt; specified on <tt>Push:</tt> lines or <tt>Pull:</tt>
lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,
-respectively. Multiple <tt>Push:</tt> and and <tt>Pull:</tt> lines may
+respectively. Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may
be specified for additional branch mappings.</p>
<p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be
specified as an older notation short-hand; the named
@@ -501,7 +501,7 @@ Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 10-Mar-2006 00:31:32 UTC
+Last updated 09-Jul-2006 20:38:41 UTC
</div>
</div>
</body>