commit - c98d46d0cf6e0024a77fc19f8f46e010198197e3
commit + 1b792db00ee03acca221b5c3a1add5b1258563b3
blob - 7f595a9998a7b400a1114b1cc25a3aeebadbb4fa
blob + 17f0cf2db991b60cb2806b295bdc10bb08da6aa8
--- git-repository.5.html
+++ git-repository.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 14, 2020</td>
+ <td class="foot-date">December 13, 2020</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - 900d72bf22b7705eeb08891a7e56da2ddea0d527
blob + a5970eaa61e3f1ec46fc560fb60aaa0bfb8b2277
--- got-worktree.5.html
+++ got-worktree.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 14, 2020</td>
+ <td class="foot-date">December 13, 2020</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - c38d39c6c5bff4414373e44c6588769b751dc94e
blob + bfba3e32c029c65c09b14df08c04bcb3ce3d000c
--- got.1.html
+++ got.1.html
</dl>
</dd>
<dt id="diff"><a class="permalink" href="#diff"><code class="Cm">diff</code></a>
- [<code class="Fl">-C</code> <var class="Ar">number</var>]
- [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
- [<code class="Fl">-s</code>] [<code class="Fl">-w</code>]
- [<var class="Ar">object1</var> <var class="Ar">object2</var> |
- <var class="Ar">path</var>]</dt>
+ [<code class="Fl">-a</code>] [<code class="Fl">-C</code>
+ <var class="Ar">number</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<code class="Fl">-s</code>]
+ [<code class="Fl">-w</code>] [<var class="Ar">object1</var>
+ <var class="Ar">object2</var> | <var class="Ar">path</var>]</dt>
<dd>When invoked within a work tree with less than two arguments, display
local changes in the work tree. If a <var class="Ar">path</var> is
specified, only show changes within this path.
<p class="Pp">The options for <code class="Cm">got diff</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="a~3"><a class="permalink" href="#a~3"><code class="Fl">-a</code></a></dt>
+ <dd>Treat file contents as ASCII text even if binary data is
+ detected.</dd>
<dt id="C~2"><a class="permalink" href="#C~2"><code class="Fl">-C</code></a>
<var class="Ar">number</var></dt>
<dd>Set the number of context lines shown in the diff. By default, 3 lines
<p class="Pp">The options for <code class="Cm">got rebase</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="a~3"><a class="permalink" href="#a~3"><code class="Fl">-a</code></a></dt>
+ <dt id="a~4"><a class="permalink" href="#a~4"><code class="Fl">-a</code></a></dt>
<dd>Abort an interrupted rebase operation. If this option is used, no
other command-line arguments are allowed.</dd>
<dt id="c~9"><a class="permalink" href="#c~9"><code class="Fl">-c</code></a></dt>
<dd>Short alias for <code class="Cm">rebase</code>.</dd>
<dt id="histedit"><a class="permalink" href="#histedit"><code class="Cm">histedit</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
- [<code class="Fl">-F</code> <var class="Ar">histedit-script</var>]
- [<code class="Fl">-m</code>]</dt>
+ [<code class="Fl">-f</code>] [<code class="Fl">-F</code>
+ <var class="Ar">histedit-script</var>] [<code class="Fl">-m</code>]</dt>
<dd>Edit commit history between the work tree's current base commit and the
tip commit of the work tree's current branch.
<p class="Pp">Before starting a <code class="Cm">histedit</code> operation
<p class="Pp">Editing of commit history is controlled via a
<var class="Ar">histedit script</var> which can be written in an editor
based on a template, passed on the command line, or generated with the
- <code class="Fl">-m</code> option if only log messages need to be
- edited.</p>
+ <code class="Fl">-f</code> or <code class="Fl">-m</code> options.</p>
<p class="Pp">The format of the histedit script is line-based. Each line in
the script begins with a command name, followed by whitespace and an
argument. For most commands, the expected argument is a commit ID SHA1
<p class="Pp">The options for <code class="Cm">got histedit</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="a~4"><a class="permalink" href="#a~4"><code class="Fl">-a</code></a></dt>
+ <dt id="a~5"><a class="permalink" href="#a~5"><code class="Fl">-a</code></a></dt>
<dd>Abort an interrupted histedit operation. If this option is used, no
other command-line arguments are allowed.</dd>
<dt id="c~10"><a class="permalink" href="#c~10"><code class="Fl">-c</code></a></dt>
<dd>Continue an interrupted histedit operation. If this option is used, no
other command-line arguments are allowed.</dd>
+ <dt id="f~2"><a class="permalink" href="#f~2"><code class="Fl">-f</code></a></dt>
+ <dd>Fold all commits into a single commit. This option is a quick
+ equivalent to a histedit script which folds all commits, combining
+ them all into one commit. The <code class="Fl">-f</code> option can
+ only be used when starting a new histedit operation. If this option is
+ used, no other command-line arguments are allowed.</dd>
<dt id="F~2"><a class="permalink" href="#F~2"><code class="Fl">-F</code></a>
<var class="Ar">histedit-script</var></dt>
<dd>Use the specified <var class="Ar">histedit-script</var> instead of
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 14, 2020</td>
+ <td class="foot-date">December 13, 2020</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - cfa0106ce0c8d5bc1200efa7f879126761464c41
blob + 8de9abf1a8f166541dfd8cccd54e50a7ec095477
--- gotweb.8.html
+++ gotweb.8.html
appropriate configuration file sample.</li>
<li>httpd(8) and slowcgi(8) must be enabled and started:
<div class="Bd Pp Bd-indent">
- <pre>
- # rcctl enable httpd slowcgi
- # rcctl start httpd slowcgi
- </pre>
+ <pre> # rcctl enable httpd slowcgi
+ # rcctl start httpd slowcgi</pre>
</div>
</li>
<li>Optionally, the run-time behaviour of <code class="Nm">gotweb</code> can
<p class="Pp">Example configuration for httpd.conf:</p>
<div class="Bd Pp Bd-indent">
<pre>
-
types { include "/usr/share/misc/mime.types" }
server "gotweb.example.com" {
listen on * port 80
location "/*" {
directory index "index.html"
}
- }
-</pre>
+ }</pre>
</div>
</section>
<section class="Sh">
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 14, 2020</td>
+ <td class="foot-date">December 13, 2020</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - c9b506357c9dd2f6322d525b381090793df218f5
blob + a8a6343b318821e9e12246688b372bde3e1c9ae1
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
in the repository. <a class="Xr">gotweb(8)</a> will parse owner
information from either a [gotweb] or a [gitweb] section. For example:
<div class="Bd Pp Bd-indent">
- <pre>
-[gotweb]
-owner = "Your Name"
- </pre>
+ <pre>[gotweb]
+owner = "Your Name"</pre>
</div>
</dd>
<dt id="got_site_link"><a class="permalink" href="#got_site_link"><code class="Ic">got_site_link</code></a>
<a class="Xr">gotweb(8)</a> with their default values.</p>
<div class="Bd Pp Bd-indent">
<pre>
-
#
# gotweb options
# all paths relative to /var/www (httpd chroot jail)
#got_show_repo_owner off
#got_show_repo_age false
#got_show_repo_description no
-#got_show_repo_cloneurl off
-</pre>
+#got_show_repo_cloneurl off</pre>
</div>
</section>
<section class="Sh">
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 14, 2020</td>
+ <td class="foot-date">December 13, 2020</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - dc8f7703a716c347c15e61486c7e81beab314095
blob + 9f387be0da7631e1bed628fd0cc7d38094b1bbd6
--- tog.1.html
+++ tog.1.html
<dd>Displays the line-by-line history of a file.</dd>
<dt>Tree view</dt>
<dd>Displays the tree corresponding to a particular commit.</dd>
+ <dt>Ref view</dt>
+ <dd>Displays references in the repository.</dd>
</dl>
<p class="Pp"><code class="Nm">tog</code> provides global and command-specific
key bindings and options. The global key bindings are:</p>
Searching continues until either a match is found or the
<code class="Cm">Backspace</code> key is pressed.</dd>
<dt id="Ctrl+l"><a class="permalink" href="#Ctrl+l"><code class="Cm">Ctrl+l</code></a></dt>
- <dd>Reload the log view with new commits found in the repository.</dd>
+ <dd>Reload the <code class="Cm">log</code> view with new commits found in
+ the repository.</dd>
<dt id="B"><a class="permalink" href="#B"><code class="Cm">B</code></a></dt>
- <dd>Reload the log view and toggle display of merged commits. The
- <code class="Fl">-b</code> option determines whether merged commits
- are displayed initially.</dd>
+ <dd>Reload the <code class="Cm">log</code> view and toggle display of
+ merged commits. The <code class="Fl">-b</code> option determines
+ whether merged commits are displayed initially.</dd>
+ <dt id="r"><a class="permalink" href="#r"><code class="Cm">r</code></a></dt>
+ <dd>Open a <code class="Cm">ref</code> view listing all references in the
+ repository. This can then be used to open a new
+ <code class="Cm">log</code> view for arbitrary branches and tags.</dd>
</dl>
<p class="Pp">The options for <code class="Cm">tog log</code> are as
follows:</p>
is unique. If this option is not specified, default to the work tree's
current branch if invoked in a work tree, or to the repository's HEAD
reference.</dd>
- <dt id="r"><a class="permalink" href="#r"><code class="Fl">-r</code></a>
+ <dt id="r~2"><a class="permalink" href="#r~2"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
</dl>
</dd>
<dt id="diff"><a class="permalink" href="#diff"><code class="Cm">diff</code></a>
- [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
- <var class="Ar">object1 object2</var></dt>
- <dd>Display the differences between two objects in the repository. Each
- <var class="Ar">object</var> argument is an object ID SHA1 hash. An
+ [<code class="Fl">-a</code>] [<code class="Fl">-C</code>
+ <var class="Ar">number</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<code class="Fl">-w</code>]
+ <var class="Ar">object1</var> <var class="Ar">object2</var></dt>
+ <dd>Display the differences between two objects in the repository. Treat each
+ of the two arguments as a reference, a tag name, or an object ID SHA1
+ hash, and display differences between the corresponding objects. Both
+ objects must be of the same type (blobs, trees, or commits). An
abbreviated hash argument will be expanded to a full SHA1 hash
- automatically, provided the abbreviation is unique. Both objects must be
- of the same type (blobs, trees, or commits).
+ automatically, provided the abbreviation is unique.
<p class="Pp">The key bindings for <code class="Cm">tog diff</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="a"><a class="permalink" href="#a"><code class="Cm">a</code></a></dt>
+ <dd>Toggle treatment of file contents as ASCII text even if binary data
+ was detected.</dd>
<dt id="Down-arrow,~2"><a class="permalink" href="#Down-arrow,~2"><code class="Cm">Down-arrow,
j</code></a></dt>
<dd>Scroll down.</dd>
<dd>Increase the amount of diff context lines.</dd>
<dt id="_,"><a class="permalink" href="#_,"><code class="Cm"><,
Comma</code></a></dt>
- <dd>If the diff view was opened via the log view, move to the previous
- (younger) commit.</dd>
+ <dd>If the <code class="Cm">diff</code> view was opened via the
+ <code class="Cm">log</code> view, move to the previous (younger)
+ commit.</dd>
<dt id="_,~2"><a class="permalink" href="#_,~2"><code class="Cm">>,
Full stop</code></a></dt>
- <dd>If the diff view was opened via the log view, move to the next (older)
- commit.</dd>
+ <dd>If the <code class="Cm">diff</code> view was opened via the
+ <code class="Cm">log</code> view, move to the next (older)
+ commit.</dd>
<dt id="/~2"><a class="permalink" href="#/~2"><code class="Cm">/</code></a></dt>
<dd>Prompt for a search pattern and start searching for matching lines.
The search pattern is an extended regular expression. Regular
<dd>Find the next line which matches the current search pattern.</dd>
<dt id="N~2"><a class="permalink" href="#N~2"><code class="Cm">N</code></a></dt>
<dd>Find the previous line which matches the current search pattern.</dd>
+ <dt id="w"><a class="permalink" href="#w"><code class="Cm">w</code></a></dt>
+ <dd>Toggle display of whitespace-only changes.</dd>
</dl>
<p class="Pp">The options for <code class="Cm">tog diff</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="r~2"><a class="permalink" href="#r~2"><code class="Fl">-r</code></a>
+ <dt id="a~2"><a class="permalink" href="#a~2"><code class="Fl">-a</code></a></dt>
+ <dd>Treat file contents as ASCII text even if binary data is
+ detected.</dd>
+ <dt id="C"><a class="permalink" href="#C"><code class="Fl">-C</code></a>
+ <var class="Ar">number</var></dt>
+ <dd>Set the number of context lines shown in the diff. By default, 3 lines
+ of context are shown.</dd>
+ <dt id="r~3"><a class="permalink" href="#r~3"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
this directory is a <a class="Xr">got(1)</a> work tree, use the
repository path associated with this work tree.</dd>
+ <dt id="w~2"><a class="permalink" href="#w~2"><code class="Fl">-w</code></a></dt>
+ <dd>Ignore whitespace-only changes.</dd>
</dl>
</dd>
<dt id="blame"><a class="permalink" href="#blame"><code class="Cm">blame</code></a>
branch or a commit ID SHA1 hash. An abbreviated hash argument will be
expanded to a full SHA1 hash automatically, provided the abbreviation
is unique.</dd>
- <dt id="r~3"><a class="permalink" href="#r~3"><code class="Fl">-r</code></a>
+ <dt id="r~4"><a class="permalink" href="#r~4"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
<dt id="l"><a class="permalink" href="#l"><code class="Cm">l</code></a></dt>
<dd>Open a <code class="Cm">log</code> view for the currently selected
tree entry.</dd>
+ <dt id="r~5"><a class="permalink" href="#r~5"><code class="Cm">r</code></a></dt>
+ <dd>Open a <code class="Cm">ref</code> view listing all references in the
+ repository. This can then be used to open a new
+ <code class="Cm">tree</code> view for arbitrary branches and
+ tags.</dd>
<dt id="Backspace~2"><a class="permalink" href="#Backspace~2"><code class="Cm">Backspace</code></a></dt>
<dd>Move back to the parent directory.</dd>
<dt id="i"><a class="permalink" href="#i"><code class="Cm">i</code></a></dt>
branch or a commit ID SHA1 hash. An abbreviated hash argument will be
expanded to a full SHA1 hash automatically, provided the abbreviation
is unique.</dd>
- <dt id="r~4"><a class="permalink" href="#r~4"><code class="Fl">-r</code></a>
+ <dt id="r~6"><a class="permalink" href="#r~6"><code class="Fl">-r</code></a>
+ <var class="Ar">repository-path</var></dt>
+ <dd>Use the repository at the specified path. If not specified, assume the
+ repository is located at or above the current working directory. If
+ this directory is a <a class="Xr">got(1)</a> work tree, use the
+ repository path associated with this work tree.</dd>
+ </dl>
+ </dd>
+ <dt id="ref"><a class="permalink" href="#ref"><code class="Cm">ref</code></a>
+ [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]</dt>
+ <dd>Display references in the repository.
+ <p class="Pp">The key bindings for <code class="Cm">tog ref</code> are as
+ follows:</p>
+ <dl class="Bl-tag">
+ <dt id="Down-arrow,~5"><a class="permalink" href="#Down-arrow,~5"><code class="Cm">Down-arrow,
+ j</code></a></dt>
+ <dd>Move the selection cursor down.</dd>
+ <dt id="Up-arrow,~5"><a class="permalink" href="#Up-arrow,~5"><code class="Cm">Up-arrow,
+ k</code></a></dt>
+ <dd>Move the selection cursor up.</dd>
+ <dt id="Page-down,~5"><a class="permalink" href="#Page-down,~5"><code class="Cm">Page-down,
+ Ctrl+f</code></a></dt>
+ <dd>Move the selection cursor down one page.</dd>
+ <dt id="Page-up,~5"><a class="permalink" href="#Page-up,~5"><code class="Cm">Page-up,
+ Ctrl+b</code></a></dt>
+ <dd>Move the selection cursor up one page.</dd>
+ <dt id="Enter~3"><a class="permalink" href="#Enter~3"><code class="Cm">Enter</code></a></dt>
+ <dd>Open a <code class="Cm">log</code> view which begins traversing
+ history at the commit resolved via the currently selected
+ reference.</dd>
+ <dt id="t~2"><a class="permalink" href="#t~2"><code class="Cm">t</code></a></dt>
+ <dd>Open a <code class="Cm">tree</code> view showing the tree resolved via
+ the currently selected reference.</dd>
+ <dt id="i~2"><a class="permalink" href="#i~2"><code class="Cm">i</code></a></dt>
+ <dd>Show object IDs for all non-symbolic references displayed in the
+ <code class="Cm">ref</code> view.</dd>
+ <dt id="/~5"><a class="permalink" href="#/~5"><code class="Cm">/</code></a></dt>
+ <dd>Prompt for a search pattern and start searching for matching
+ references. The search pattern is an extended regular expression which
+ is matched against absolute reference names. Regular expression syntax
+ is documented in <a class="Xr">re_format(7)</a>.</dd>
+ <dt id="n~5"><a class="permalink" href="#n~5"><code class="Cm">n</code></a></dt>
+ <dd>Find the next reference which matches the current search pattern.</dd>
+ <dt id="N~5"><a class="permalink" href="#N~5"><code class="Cm">N</code></a></dt>
+ <dd>Find the previous reference which matches the current search
+ pattern.</dd>
+ <dt id="Ctrl+l~2"><a class="permalink" href="#Ctrl+l~2"><code class="Cm">Ctrl+l</code></a></dt>
+ <dd>Reload the list of references displayed by the
+ <code class="Cm">ref</code> view.</dd>
+ </dl>
+ <p class="Pp">The options for <code class="Cm">tog ref</code> are as
+ follows:</p>
+ <dl class="Bl-tag">
+ <dt id="r~7"><a class="permalink" href="#r~7"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
<dt id="TOG_COLOR_DATE"><a class="permalink" href="#TOG_COLOR_DATE"><code class="Ev">TOG_COLOR_DATE</code></a></dt>
<dd>The color used to mark up date information. If not set, the default value
“yellow” is used.</dd>
+ <dt id="TOG_COLOR_REFS_HEADS"><a class="permalink" href="#TOG_COLOR_REFS_HEADS"><code class="Ev">TOG_COLOR_REFS_HEADS</code></a></dt>
+ <dd>The color used to mark up references in the “refs/heads/”
+ namespace. If not set, the default value “green” is
+ used.</dd>
+ <dt id="TOG_COLOR_REFS_TAGS"><a class="permalink" href="#TOG_COLOR_REFS_TAGS"><code class="Ev">TOG_COLOR_REFS_TAGS</code></a></dt>
+ <dd>The color used to mark up references in the “refs/tags/”
+ namespace. If not set, the default value “magenta” is
+ used.</dd>
+ <dt id="TOG_COLOR_REFS_REMOTES"><a class="permalink" href="#TOG_COLOR_REFS_REMOTES"><code class="Ev">TOG_COLOR_REFS_REMOTES</code></a></dt>
+ <dd>The color used to mark up references in the “refs/remotes/”
+ namespace. If not set, the default value “yellow” is
+ used.</dd>
</dl>
</section>
<section class="Sh">
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 14, 2020</td>
+ <td class="foot-date">December 13, 2020</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
