commit 9e67ab87b19a7e0aac9ed41bc90ab61578403f28
from: Stefan Sperling <stsp@stsp.name>
date: Tue Apr 14 12:07:52 2020 UTC

sync man pages

commit - c90f14c10230150c43a212787c98f4a6586a48e0
commit + 9e67ab87b19a7e0aac9ed41bc90ab61578403f28
blob - ec0861df041d7ad4bbd2252eac345c6cbbbe53bc
blob + 3dc3b7033b11831036e185f78862d7e9c05a01a1
--- git-repository.5.html
+++ git-repository.5.html
@@ -207,7 +207,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">March 23, 2020</td>
+    <td class="foot-date">April 14, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - fae5989aebfc5450f3ad2038f1ac802bc0e78d4d
blob + a96f97bad2fc8a37465b7629293f123659c5a4c9
--- got-worktree.5.html
+++ got-worktree.5.html
@@ -174,7 +174,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">March 23, 2020</td>
+    <td class="foot-date">April 14, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - 7669db78103979108cf1717ef3963fbc5ea5554e
blob + efb9dea47719450d19ecdde457ebb9fe647eeccd
--- got.1.html
+++ got.1.html
@@ -425,8 +425,12 @@
     [<code class="Fl">-b</code> <var class="Ar">branch</var>]
     [<code class="Fl">-c</code> <var class="Ar">commit</var>]
     [<var class="Ar">path ...</var>]</dt>
-  <dd>Update an existing work tree to a different commit. Show the status of
-      each affected file, using the following status codes:
+  <dd>Update an existing work tree to a different <var class="Ar">commit</var>.
+      Change existing files in the work tree as necessary to match file contents
+      of this commit. Preserve any local changes in the work tree and merge them
+      with the incoming changes.
+    <p class="Pp">Show the status of each affected file, using the following
+        status codes:</p>
     <table class="Bl-column">
       <tr>
         <td>U</td>
@@ -480,7 +484,17 @@
         <var class="Ar">branch</var></dt>
       <dd>Switch the work tree's branch reference to the specified
           <var class="Ar">branch</var> before updating the work tree. This
-          option requires that all paths in the work tree are updated.</dd>
+          option requires that all paths in the work tree are updated.
+        <p class="Pp">As usual, any local changes in the work tree will be
+            preserved. This can be useful when switching to a newly created
+            branch in order to commit existing local changes to this branch.</p>
+        <p class="Pp">Any local changes must be dealt with separately in order
+            to obtain a work tree with pristine file contents corresponding
+            exactly to the specified <var class="Ar">branch</var>. Such changes
+            could first be committed to a different branch with
+            <code class="Cm">got commit</code>, or could be discarded with
+            <code class="Cm">got revert</code>.</p>
+      </dd>
       <dt><a class="permalink" href="#c_2"><code class="Fl" id="c_2">-c</code></a>
         <var class="Ar">commit</var></dt>
       <dd>Update the work tree to the specified <var class="Ar">commit</var>.
@@ -1980,7 +1994,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">March 23, 2020</td>
+    <td class="foot-date">April 14, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - 7ac78c671f256ce8ed9237aa5879e7137892824c
blob + 0cd45f8ebb1a60631130b5676e1510781133240b
--- gotweb.8.html
+++ gotweb.8.html
@@ -157,7 +157,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">March 23, 2020</td>
+    <td class="foot-date">April 14, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - 025fe59e9a052b1f7cd7f2ff2aa8bbeb39682081
blob + 3778de070380bde2f95eaf0b47a05480863c6e05
--- tog.1.html
+++ tog.1.html
@@ -460,7 +460,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">March 23, 2020</td>
+    <td class="foot-date">April 14, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>