Autogenerated HTML docs for v2.37.1-188-g71a8f

1 files changed, 5 insertions, 9 deletions

diff --git a/git-rev-parse.html b/git-rev-parse.html
index 3a0b9ee85..0f9100641 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -1464,12 +1464,9 @@ some output processing may assume ref names in UTF-8.</p></div>
 </dt>

 <dd>

 <p>

-  The suffix <em>@{upstream}</em> to a branchname (short form <em>&lt;branchname&gt;@{u}</em>)

-  refers to the branch that the branch specified by branchname is set to build on

-  top of (configured with <code>branch.&lt;name&gt;.remote</code> and

-  <code>branch.&lt;name&gt;.merge</code>).  A missing branchname defaults to the

-  current one. These suffixes are also accepted when spelled in uppercase, and

-  they mean the same thing no matter the case.

+  A branch B may be set up to build on top of a branch X (configured with

+  <code>branch.&lt;name&gt;.merge</code>) at a remote R (configured with

+  the branch X taken from remote R, typically found at <code>refs/remotes/R/X</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1479,9 +1476,8 @@ some output processing may assume ref names in UTF-8.</p></div>
 <p>

   The suffix <em>@{push}</em> reports the branch "where we would push to" if

   <code>git push</code> were run while <code>branchname</code> was checked out (or the current

-  <code>HEAD</code> if no branchname is specified). Since our push destination is

-  in a remote repository, of course, we report the local tracking branch

-  that corresponds to that branch (i.e., something in <code>refs/remotes/</code>).

+  <code>HEAD</code> if no branchname is specified). Like for <em>@{upstream}</em>, we report

+  the remote-tracking branch that corresponds to that branch at the remote.

 </p>

 <div class="paragraph"><p>Here&#8217;s an example to make it more clear:</p></div>

 <div class="listingblock">