Autogenerated HTML docs for v2.36.1-195-g8ddf5

1 files changed, 11 insertions, 8 deletions

diff --git a/git-branch.html b/git-branch.html
index fba19e369..335d58bb2 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -1085,13 +1085,16 @@ way to clean up all obsolete remote-tracking branches.</p></div>
 <code>-t</code>, <code>--track</code>, or <code>--track=direct</code> means to use the start-point branch

 itself as the upstream; <code>--track=inherit</code> means to copy the upstream

 configuration of the start-point branch.</p></div>

-<div class="paragraph"><p><code>--track=direct</code> is the default when the start point is a remote-tracking branch.

-Set the branch.autoSetupMerge configuration variable to <code>false</code> if you

-want <code>git switch</code>, <code>git checkout</code> and <code>git branch</code> to always behave as if <code>--no-track</code>

-were given. Set it to <code>always</code> if you want this behavior when the

-start-point is either a local or remote-tracking branch. Set it to

-<code>inherit</code> if you want to copy the tracking configuration from the

-branch point.</p></div>

+<div class="paragraph"><p>The branch.autoSetupMerge configuration variable specifies how <code>git switch</code>,

+<code>git checkout</code> and <code>git branch</code> should behave when neither <code>--track</code> nor

+<code>--no-track</code> are specified:</p></div>

+<div class="paragraph"><p>The default option, <code>true</code>, behaves as though <code>--track=direct</code>

+were given whenever the start-point is a remote-tracking branch.

+<code>false</code> behaves as if <code>--no-track</code> were given. <code>always</code> behaves as though

+<code>--track=direct</code> were given. <code>inherit</code> behaves as though <code>--track=inherit</code>

+were given. <code>simple</code> behaves as though <code>--track=direct</code> were given only when

+the start-point is a remote-tracking branch and the new branch has the same

+name as the remote branch.</p></div>

 <div class="paragraph"><p>See <a href="git-pull.html">git-pull(1)</a> and <a href="git-config.html">git-config(1)</a> for additional discussion on

 how the <code>branch.&lt;name&gt;.remote</code> and <code>branch.&lt;name&gt;.merge</code> options are used.</p></div>

 </dd>

@@ -1427,7 +1430,7 @@ a branch?&#8221;</a> in the Git User&#8217;s Manual.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-02-18 14:05:46 PST

+ 2022-05-26 16:11:01 PDT

 </div>

 </div>

 </body>