Autogenerated HTML docs for v2.29.1-59-gf9b64

1 files changed, 27 insertions, 2 deletions

diff --git a/git-push.html b/git-push.html
index 2ed717845..9a6904a8e 100644
--- a/git-push.html
+++ b/git-push.html
@@ -753,7 +753,7 @@ git-push(1) Manual Page
            [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]

            [-u | --set-upstream] [-o <string> | --push-option=<string>]

            [--[no-]signed|--signed=(true|false|if-asked)]

-           [--force-with-lease[=<refname>[:<expect>]]]

+           [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]

            [--no-verify] [&lt;repository&gt; [&lt;refspec&gt;&#8230;]]</pre>

 <div class="attribution">

 </div></div>

@@ -1140,6 +1140,13 @@ seen and are willing to overwrite, then rewrite history, and finally
 force push changes to <code>master</code> if the remote version is still at

 <code>base</code>, regardless of what your local <code>remotes/origin/master</code> has been

 updated to in the background.</p></div>

+<div class="paragraph"><p>Alternatively, specifying <code>--force-if-includes</code> as an ancillary option

+along with <code>--force-with-lease[=&lt;refname&gt;]</code> (i.e., without saying what

+exact commit the ref on the remote side must be pointing at, or which

+refs on the remote side are being protected) at the time of "push" will

+verify if updates from the remote-tracking refs that may have been

+implicitly updated in the background are integrated locally before

+allowing a forced update.</p></div>

 </dd>

 <dt class="hdlist1">

 -f

@@ -1167,6 +1174,24 @@ origin +master</code> to force a push to the <code>master</code> branch). See th
 <code>&lt;refspec&gt;...</code> section above for details.</p></div>

 </dd>

 <dt class="hdlist1">

+--[no-]force-if-includes

+</dt>

+<dd>

+<p>

+        Force an update only if the tip of the remote-tracking ref

+        has been integrated locally.

+</p>

+<div class="paragraph"><p>This option enables a check that verifies if the tip of the

+remote-tracking ref is reachable from one of the "reflog" entries of

+the local branch based in it for a rewrite. The check ensures that any

+updates from the remote have been incorporated locally by rejecting the

+forced update if that is not the case.</p></div>

+<div class="paragraph"><p>If the option is passed without specifying <code>--force-with-lease</code>, or

+specified along with <code>--force-with-lease=&lt;refname&gt;:&lt;expect&gt;</code>, it is

+a "no-op".</p></div>

+<div class="paragraph"><p>Specifying <code>--no-force-if-includes</code> disables this behavior.</p></div>

+</dd>

+<dt class="hdlist1">

 --repo=&lt;repository&gt;

 </dt>

 <dd>

@@ -1946,7 +1971,7 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-03-10 08:03:13 PDT

+ 2020-10-27 15:58:27 PDT

 </div>

 </div>

 </body>