Commit Diff


commit - a7200bb7b53a5b20794f21289ba7cf343a166ac7
commit + cc85973b1fe6b3135eec29851b66a474bfc9e379
blob - be478ca88f2813163f659b1ad60fe5bdcf905c35
blob + f9f1baacd73e07babd264515c83fb013ab2e3040
--- git-repository.5.html
+++ git-repository.5.html
@@ -208,7 +208,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">October 21, 2019</td>
+    <td class="foot-date">November 27, 2019</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - 246d05b5fa9703a29568fdd11cb9358fef94f448
blob + 991e520c14c73dad6fb9211c4b1062bff36e0679
--- got-worktree.5.html
+++ got-worktree.5.html
@@ -174,7 +174,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">October 21, 2019</td>
+    <td class="foot-date">November 27, 2019</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - d45bc51f501abcb7cb86e0a99517b8a961e34f31
blob + 0e9bc9d32378fc8a13abd6b2dc8ff0a1b955ddcf
--- got.1.html
+++ got.1.html
@@ -116,8 +116,8 @@
       <dt><a class="permalink" href="#b"><code class="Fl" id="b">-b</code></a>
         <var class="Ar">branch</var></dt>
       <dd>Create the specified <var class="Ar">branch</var> instead of creating
-          the default branch &#x201C;master&#x201D;. Use of this option is
-          required if the &#x201C;master&#x201D; branch already exists.</dd>
+          the default branch &#x201C;main&#x201D;. Use of this option is
+          required if the &#x201C;main&#x201D; branch already exists.</dd>
       <dt><a class="permalink" href="#m"><code class="Fl" id="m">-m</code></a>
         <var class="Ar">message</var></dt>
       <dd>Use the specified log message when creating the new commit. Without
@@ -548,28 +548,31 @@
     </dl>
   </dd>
   <dt><a class="permalink" href="#branch"><code class="Cm" id="branch">branch</code></a>
+    [<code class="Fl">-c</code> <var class="Ar">commit</var>]
     [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
     [<code class="Fl">-l</code>] [<code class="Fl">-d</code>
-    <var class="Ar">name</var>] [<var class="Ar">name</var>
-    [<var class="Ar">commit</var>]]</dt>
+    <var class="Ar">name</var>] [<var class="Ar">name</var>]</dt>
   <dd>Manage branches in a repository.
     <p class="Pp">Branches are managed via references which live in the
         &#x201C;refs/heads/&#x201D; reference namespace. The
         <code class="Cm">got branch</code> command operates on references in
         this namespace only.</p>
     <p class="Pp">If invoked in a work tree without any arguments, print the
-        name of the work tree's current branch. If one or two arguments are
-        passed, attempt to create a branch reference with the given
-        <var class="Ar">name</var>, and make it point at the given
-        <var class="Ar">commit</var>. The expected <var class="Ar">commit</var>
-        argument is a commit ID SHA1 hash or an existing reference or tag name
-        which will be resolved to a commit ID. If no
-        <var class="Ar">commit</var> is specified, default to the latest commit
-        on the work tree's current branch if invoked in a work tree, or to a
-        commit resolved via the repository's HEAD reference.</p>
+        name of the work tree's current branch. If a <var class="Ar">name</var>
+        argument is passed, attempt to create a branch reference with the given
+        name. By default the new branch reference will point at the latest
+        commit on the work tree's current branch if invoked in a work tree, and
+        otherwise to a commit resolved via the repository's HEAD reference.</p>
     <p class="Pp">The options for <code class="Cm">got branch</code> are as
         follows:</p>
     <dl class="Bl-tag">
+      <dt><a class="permalink" href="#c_6"><code class="Fl" id="c_6">-c</code></a>
+        <var class="Ar">commit</var></dt>
+      <dd>Make a newly created branch reference point at the specified
+          <var class="Ar">commit</var>. The expected
+          <var class="Ar">commit</var> argument is a commit ID SHA1 hash or an
+          existing reference or tag name which will be resolved to a commit
+        ID.</dd>
       <dt><a class="permalink" href="#r_7"><code class="Fl" id="r_7">-r</code></a>
         <var class="Ar">repository-path</var></dt>
       <dd>Use the repository at the specified path. If not specified, assume the
@@ -628,7 +631,7 @@
       <dt><a class="permalink" href="#m_2"><code class="Fl" id="m_2">-m</code></a>
         <var class="Ar">message</var></dt>
       <dd>Use the specified tag message when creating the new tag Without the
-          <code class="Fl">-m</code> option, <code class="Cm">got import</code>
+          <code class="Fl">-m</code> option, <code class="Cm">got tag</code>
           opens a temporary file in an editor where a tag message can be
           written.</dd>
       <dt><a class="permalink" href="#r_8"><code class="Fl" id="r_8">-r</code></a>
@@ -649,9 +652,18 @@
         copied to another repository.</p>
   </dd>
   <dt><a class="permalink" href="#add"><code class="Cm" id="add">add</code></a>
-    <var class="Ar">file-path ...</var></dt>
+    [<code class="Fl">-R</code>] <var class="Ar">path ...</var></dt>
   <dd>Schedule unversioned files in a work tree for addition to the repository
-      in the next commit.</dd>
+      in the next commit.
+    <p class="Pp">The options for <code class="Cm">got add</code> are as
+        follows:</p>
+    <dl class="Bl-tag">
+      <dt><a class="permalink" href="#R_2"><code class="Fl" id="R_2">-R</code></a></dt>
+      <dd>Permit recursion into directories. If this option is not specified,
+          <code class="Cm">got add</code> will refuse to run if a specified
+          <var class="Ar">path</var> is a directory.</dd>
+    </dl>
+  </dd>
   <dt><a class="permalink" href="#remove"><code class="Cm" id="remove">remove</code></a>
     <var class="Ar">file-path ...</var></dt>
   <dd>Remove versioned files from a work tree and schedule them for deletion
@@ -694,7 +706,7 @@
           &#x201C;n&#x201D;, and &#x201C;q&#x201D; responses line-by-line from
           the specified <var class="Ar">response-script</var> file instead of
           prompting interactively.</dd>
-      <dt><a class="permalink" href="#R_2"><code class="Fl" id="R_2">-R</code></a></dt>
+      <dt><a class="permalink" href="#R_3"><code class="Fl" id="R_3">-R</code></a></dt>
       <dd>Permit recursion into directories. If this option is not specified,
           <code class="Cm">got revert</code> will refuse to run if a specified
           <var class="Ar">path</var> is a directory.</dd>
@@ -952,7 +964,7 @@
       <dt><a class="permalink" href="#a"><code class="Fl" id="a">-a</code></a></dt>
       <dd>Abort an interrupted rebase operation. If this option is used, no
           other command-line arguments are allowed.</dd>
-      <dt><a class="permalink" href="#c_6"><code class="Fl" id="c_6">-c</code></a></dt>
+      <dt><a class="permalink" href="#c_7"><code class="Fl" id="c_7">-c</code></a></dt>
       <dd>Continue an interrupted rebase operation. If this option is used, no
           other command-line arguments are allowed.</dd>
     </dl>
@@ -1071,7 +1083,7 @@
       <dt><a class="permalink" href="#a_2"><code class="Fl" id="a_2">-a</code></a></dt>
       <dd>Abort an interrupted histedit operation. If this option is used, no
           other command-line arguments are allowed.</dd>
-      <dt><a class="permalink" href="#c_7"><code class="Fl" id="c_7">-c</code></a></dt>
+      <dt><a class="permalink" href="#c_8"><code class="Fl" id="c_8">-c</code></a></dt>
       <dd>Continue an interrupted histedit operation. If this option is used, no
           other command-line arguments are allowed.</dd>
     </dl>
@@ -1287,7 +1299,7 @@
     <p class="Pp">The options for <code class="Cm">got cat</code> are as
         follows:</p>
     <dl class="Bl-tag">
-      <dt><a class="permalink" href="#c_8"><code class="Fl" id="c_8">-c</code></a>
+      <dt><a class="permalink" href="#c_9"><code class="Fl" id="c_9">-c</code></a>
         <var class="Ar">commit</var></dt>
       <dd>Look up paths in the specified <var class="Ar">commit</var>. If this
           option is not used, paths are looked up in the commit resolved via the
@@ -1552,7 +1564,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">October 21, 2019</td>
+    <td class="foot-date">November 27, 2019</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - 219b56b401d8442414a26afe15f4bb4535f3e7c3
blob + 2b64569a6b196ae9f12d0121a6201fcc53938a50
--- tog.1.html
+++ tog.1.html
@@ -327,6 +327,52 @@
           is unique.</dd>
     </dl>
   </dd>
+</dl>
+</section>
+<section class="Sh">
+<h1 class="Sh" id="ENVIRONMENT"><a class="permalink" href="#ENVIRONMENT">ENVIRONMENT</a></h1>
+<dl class="Bl-tag">
+  <dt><a class="permalink" href="#TOG_COLORS"><code class="Ev" id="TOG_COLORS">TOG_COLORS</code></a></dt>
+  <dd><code class="Nm">tog</code> shows colorized output if this variable is set
+      to a non-empty value. The default color scheme can be modified by setting
+      the environment variables documented below. The colors available in color
+      schemes are &#x201C;black&#x201D;, &#x201C;red&#x201D;,
+      &#x201C;green&#x201D;, &#x201C;yellow&#x201D;, &#x201C;blue&#x201D;,
+      &#x201C;megenta&#x201D;, &#x201C;cyan&#x201D;, and &#x201C;default&#x201D;
+      which maps to the terminal's default foreground color.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_DIFF_MINUS"><code class="Ev" id="TOG_COLOR_DIFF_MINUS">TOG_COLOR_DIFF_MINUS</code></a></dt>
+  <dd>The color used to mark up removed lines in diffs. If not set, the default
+      value &#x201C;magenta&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_DIFF_PLUS"><code class="Ev" id="TOG_COLOR_DIFF_PLUS">TOG_COLOR_DIFF_PLUS</code></a></dt>
+  <dd>The color used to mark up added lines in diffs. If not set, the default
+      value &#x201C;cyan&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_DIFF_CHUNK_HEADER"><code class="Ev" id="TOG_COLOR_DIFF_CHUNK_HEADER">TOG_COLOR_DIFF_CHUNK_HEADER</code></a></dt>
+  <dd>The color used to mark up chunk header lines in diffs. If not set, the
+      default value &#x201C;yellow&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_DIFF_META"><code class="Ev" id="TOG_COLOR_DIFF_META">TOG_COLOR_DIFF_META</code></a></dt>
+  <dd>The color used to mark up meta data in diffs. If not set, the default
+      value &#x201C;green&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_TREE_SUBMODULE"><code class="Ev" id="TOG_COLOR_TREE_SUBMODULE">TOG_COLOR_TREE_SUBMODULE</code></a></dt>
+  <dd>The color used to mark up sobmodules tree entries. If not set, the default
+      value &#x201C;magenta&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_TREE_SYMLINK"><code class="Ev" id="TOG_COLOR_TREE_SYMLINK">TOG_COLOR_TREE_SYMLINK</code></a></dt>
+  <dd>The color used to mark up symbolic link tree entries. If not set, the
+      default value &#x201C;cyan&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_TREE_DIRECTORY"><code class="Ev" id="TOG_COLOR_TREE_DIRECTORY">TOG_COLOR_TREE_DIRECTORY</code></a></dt>
+  <dd>The color used to mark up directory tree entries. If not set, the default
+      value &#x201C;blue&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_TREE_EXECUTABLE"><code class="Ev" id="TOG_COLOR_TREE_EXECUTABLE">TOG_COLOR_TREE_EXECUTABLE</code></a></dt>
+  <dd>The color used to mark up executable file tree entries. If not set, the
+      default value &#x201C;green&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_COMMIT"><code class="Ev" id="TOG_COLOR_COMMIT">TOG_COLOR_COMMIT</code></a></dt>
+  <dd>The color used to mark up commit IDs. If not set, the default value
+      &#x201C;green&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_AUTHOR"><code class="Ev" id="TOG_COLOR_AUTHOR">TOG_COLOR_AUTHOR</code></a></dt>
+  <dd>The color used to mark up author information. If not set, the default
+      value &#x201C;cyan&#x201D; is used.</dd>
+  <dt><a class="permalink" href="#TOG_COLOR_DATE"><code class="Ev" id="TOG_COLOR_DATE">TOG_COLOR_DATE</code></a></dt>
+  <dd>The color used to mark up date information. If not set, the default value
+      &#x201C;yellow&#x201D; is used.</dd>
 </dl>
 </section>
 <section class="Sh">
@@ -352,7 +398,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">October 21, 2019</td>
+    <td class="foot-date">November 27, 2019</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>