Autogenerated HTML docs for v2.4.0-rc0-37-ga3b75

1 files changed, 7 insertions, 9 deletions

diff --git a/git-push.html b/git-push.html
index 514e6a3ab..e1cffdc90 100644
--- a/git-push.html
+++ b/git-push.html
@@ -968,9 +968,8 @@ already exists on the remote side.</p></div>
         Usually, "git push" refuses to update a remote ref that is

         not an ancestor of the local ref used to overwrite it.

 </p>

-<div class="paragraph"><p>This option bypasses the check, but instead requires that the

-current value of the ref to be the expected value.  "git push"

-fails otherwise.</p></div>

+<div class="paragraph"><p>This option overrides this restriction if the current value of the

+remote ref is the expected value.  "git push" fails otherwise.</p></div>

 <div class="paragraph"><p>Imagine that you have to rebase what you have already published.

 You will have to bypass the "must fast-forward" rule in order to

 replace the history you originally published with the rebased history.

@@ -980,14 +979,13 @@ commit, and blindly pushing with <code>--force</code> will lose her work.</p></d
 <div class="paragraph"><p>This option allows you to say that you expect the history you are

 updating is what you rebased and want to replace. If the remote ref

 still points at the commit you specified, you can be sure that no

-other people did anything to the ref (it is like taking a "lease" on

-the ref without explicitly locking it, and you update the ref while

-making sure that your earlier "lease" is still valid).</p></div>

+other people did anything to the ref. It is like taking a "lease" on

+the ref without explicitly locking it, and the remote ref is updated

+only if the "lease" is still valid.</p></div>

 <div class="paragraph"><p><code>--force-with-lease</code> alone, without specifying the details, will protect

 all remote refs that are going to be updated by requiring their

 current value to be the same as the remote-tracking branch we have

-for them, unless specified with a <code>--force-with-lease=&lt;refname&gt;:&lt;expect&gt;</code>

-option that explicitly states what the expected value is.</p></div>

+for them.</p></div>

 <div class="paragraph"><p><code>--force-with-lease=&lt;refname&gt;</code>, without specifying the expected value, will

 protect the named ref (alone), if it is going to be updated, by

 requiring its current value to be the same as the remote-tracking

@@ -1742,7 +1740,7 @@ a <code>git gc</code> command on the origin repository.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2015-03-23 14:31:16 PDT

+Last updated 2015-03-28 11:17:28 PDT

 </div>

 </div>

 </body>