diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 19:54:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 19:54:04 -0700 |
| commit | c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db (patch) | |
| tree | 06ddfc72dff8e370e395a3acc692c8ab48147227 /git-pull.html | |
| parent | d0a9940c76b71c9df840a098a423d3400779d83c (diff) | |
| download | git-htmldocs-c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db.tar.gz | |
Autogenerated HTML docs for v2.22.0-428-g6d5b2
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/git-pull.html b/git-pull.html index cd6a83f30..e02ed4162 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1348,6 +1348,29 @@ documented in <a href="git-config.html">git-config(1)</a>.</p></div> </p>
</dd>
<dt class="hdlist1">
+--show-forced-updates
+</dt>
+<dd>
+<p>
+ By default, git checks if a branch is force-updated during
+ fetch. This can be disabled through fetch.showForcedUpdates, but
+ the --show-forced-updates option guarantees this check occurs.
+ See <a href="git-config.html">git-config(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+--no-show-forced-updates
+</dt>
+<dd>
+<p>
+ By default, git checks if a branch is force-updated during
+ fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates
+ to false to skip this check for performance reasons. If used during
+ <em>git-pull</em> the --ff-only option will still check for forced updates
+ before attempting a fast-forward update. See <a href="git-config.html">git-config(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
-4
</dt>
<dt class="hdlist1">
|