commit a43c0256d7d029504bbb5c212bb59fb703620f07
from: Stefan Sperling <stsp@stsp.name>
date: Tue Feb 25 13:35:36 2020 UTC

sync man pages

commit - 7c3b4ab81d876a0e07ae5b2c6c593a7b25458ba6
commit + a43c0256d7d029504bbb5c212bb59fb703620f07
blob - 1abcaf63a60ce2685427d34f5ab4ceba5503b9f8
blob + f2788afbf6de69c6eabd6ecb069bfbfa00721ac2
--- got.1.html
+++ got.1.html
@@ -978,14 +978,14 @@
       tree's current branch, and stops once the tip commit of the specified
       <var class="Ar">branch</var> has been rebased.
     <p class="Pp">When <code class="Cm">got rebase</code> is used as intended,
-        the specified <var class="Ar">branch</var> contains changes made in
-        local commits that are not yet visible in any other repositories. The
-        work tree's current branch, which must be set with <code class="Cm">got
-        update -b</code> before starting the <code class="Cm">rebase</code>
-        operation, represents a branch from a remote repository which shares a
-        common history with the specified <var class="Ar">branch</var> but has
-        at some point diverged due to commits added to the remote
-      repository.</p>
+        the specified <var class="Ar">branch</var> represents a local commit
+        history and may already contain changes that are not yet visible in any
+        other repositories. The work tree's current branch, which must be set
+        with <code class="Cm">got update -b</code> before starting the
+        <code class="Cm">rebase</code> operation, represents a branch from a
+        remote repository which shares a common history with the specified
+        <var class="Ar">branch</var> but has progressed, and perhaps diverged,
+        due to commits added to the remote repository.</p>
     <p class="Pp">Rebased commits are accumulated on a temporary branch which
         the work tree will remain switched to throughout the entire rebase
         operation. Commits on this branch represent the same changes with the