diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-11-27 13:53:29 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-11-27 13:53:29 -0800 |
commit | 70e980e01bc36d4da977bf70b79fd3491df4a92d (patch) | |
tree | 61f1e0e9c2fcdc7870bdab1c11318c5b9219b816 /git-push.html | |
parent | b4e58b1998835dcb225ed4792557b23160608069 (diff) | |
download | git-htmldocs-70e980e01bc36d4da977bf70b79fd3491df4a92d.tar.gz |
Autogenerated HTML docs for v1.8.0.1-250-gb797
Diffstat (limited to 'git-push.html')
-rw-r--r-- | git-push.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-push.html b/git-push.html index be0f30581..f016c7e62 100644 --- a/git-push.html +++ b/git-push.html @@ -1244,7 +1244,8 @@ leading to commit A. The history looks like this:</p></div> ---X---A</tt></pre>
</div></div>
<div class="paragraph"><p>Further suppose that the other person already pushed changes leading to A
-back to the original repository you two obtained the original commit X.</p></div>
+back to the original repository from which you two obtained the original
+commit X.</p></div>
<div class="paragraph"><p>The push done by the other person updated the branch that used to point at
commit X to point at commit A. It is a fast-forward.</p></div>
<div class="paragraph"><p>But if you try to push, you will attempt to update the branch (that
@@ -1430,7 +1431,7 @@ a <tt>git gc</tt> command on the origin repository.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-11-13 14:31:09 PDT
+Last updated 2012-11-27 13:53:10 PDT
</div>
</div>
</body>
|