Autogenerated HTML docs for v1.9.1-506-g7bf27

1 files changed, 2 insertions, 2 deletions

diff --git a/git-push.html b/git-push.html
index a57d8ff7b..a58a25dd2 100644
--- a/git-push.html
+++ b/git-push.html
@@ -1539,7 +1539,7 @@ so, the changes introduced by commit A will be lost, because everybody
 will now start building on top of B.</p></div>

 <div class="paragraph"><p>The command by default does not allow an update that is not a fast-forward

 to prevent such loss of history.</p></div>

-<div class="paragraph"><p>If you do not want to lose your work (history from X to B) nor the work by

+<div class="paragraph"><p>If you do not want to lose your work (history from X to B) or the work by

 the other person (history from X to A), you would need to first fetch the

 history from the repository, create a history that contains changes done

 by both parties, and push the result back.</p></div>

@@ -1733,7 +1733,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 2014-03-11 14:35:07 PDT

+Last updated 2014-04-08 12:47:26 PDT

 </div>

 </div>

 </body>