Autogenerated HTML docs for v2.28.0-585-ge1cff

1 files changed, 10 insertions, 6 deletions

diff --git a/git-branch.html b/git-branch.html
index ac16fc233..3f833f78b 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -752,7 +752,7 @@ git-branch(1) Manual Page
 <pre class="content"><em>git branch</em> [--color[=&lt;when&gt;] | --no-color] [--show-current]

         [-v [--abbrev=&lt;length&gt; | --no-abbrev]]

         [--column[=&lt;options&gt;] | --no-column] [--sort=&lt;key&gt;]

-        [(--merged | --no-merged) [&lt;commit&gt;]]

+        [--merged [&lt;commit&gt;]] [--no-merged [&lt;commit&gt;]]

         [--contains [&lt;commit&gt;]] [--no-contains [&lt;commit&gt;]]

         [--points-at &lt;object&gt;] [--format=&lt;format&gt;]

         [(-r | --remotes) | (-a | --all)]

@@ -1158,8 +1158,7 @@ start-point is either a local or remote-tracking branch.</p></div>
 <dd>

 <p>

         Only list branches whose tips are reachable from the

-        specified commit (HEAD if not specified). Implies <code>--list</code>,

-        incompatible with <code>--no-merged</code>.

+        specified commit (HEAD if not specified). Implies <code>--list</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1168,8 +1167,7 @@ start-point is either a local or remote-tracking branch.</p></div>
 <dd>

 <p>

         Only list branches whose tips are not reachable from the

-        specified commit (HEAD if not specified). Implies <code>--list</code>,

-        incompatible with <code>--merged</code>.

+        specified commit (HEAD if not specified). Implies <code>--list</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1368,6 +1366,12 @@ serve four related but different purposes:</p></div>
 </p>

 </li>

 </ul></div>

+<div class="paragraph"><p>When combining multiple <code>--contains</code> and <code>--no-contains</code> filters, only

+references that contain at least one of the <code>--contains</code> commits and

+contain none of the <code>--no-contains</code> commits are shown.</p></div>

+<div class="paragraph"><p>When combining multiple <code>--merged</code> and <code>--no-merged</code> filters, only

+references that are reachable from at least one of the <code>--merged</code>

+commits and from none of the <code>--no-merged</code> commits are shown.</p></div>

 </div>

 </div>

 <div class="sect1">

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

 <div id="footer-text">

 Last updated

- 2020-07-06 22:33:22 PDT

+ 2020-09-22 13:11:20 PDT

 </div>

 </div>

 </body>