commit - 89fed1f113b6f6e58fbf83b38af9d93db6ab4ea5
commit + 56f3f26e58e5af5ce463361646c8818836db83e0
blob - 7976c47b337591a6528f7c5612d4cf8713310d00
blob + be522d4aa58b8030dc21c71348996d88de88ea32
--- git-repository.5.html
+++ git-repository.5.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - 15d5badc1b031fcc097dfc1fc0713442e6f3b570
blob + c195a43bf5207a78e6bb8c531d08142c17c66e63
--- gitwrapper.1.html
+++ gitwrapper.1.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - c7720b248733e2cc40b2dfb58b34f75185aecc65
blob + 609cafc0eb22b9d276a4fffb7e8f4a6ad9d3241c
--- got-worktree.5.html
+++ got-worktree.5.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - d4ce07d75dc6d88f2b3be20e83044d8592325557
blob + c86caee93d720134b6bfc6631536b5a785196637
--- got.1.html
+++ got.1.html
tree</i></a> which can be placed at an arbitrary directory in the filesystem
hierarchy. The on-disk format of this work tree is described in
<a class="Xr" aria-label="got-worktree, section 5">got-worktree(5)</a>.</p>
-<p class="Pp"><code class="Nm">got</code> provides global and command-specific
- options. Global options must precede the command name, and are as
- follows:</p>
+<p class="Pp">The <code class="Nm">got</code> utility provides global and
+ command-specific options. Global options must precede the command name, and
+ are as follows:</p>
<dl class="Bl-tag">
<dt id="h"><a class="permalink" href="#h"><code class="Fl">-h</code></a></dt>
<dd>Display usage information and exit immediately.</dd>
<code class="Fl">--version</code></dt>
<dd>Display program version and exit immediately.</dd>
</dl>
+<p class="Pp">The <code class="Nm">got</code> utility only provides commands
+ needed to perform version control tasks. Commands needed for repository
+ maintenance tasks are provided by <a class="Xr" aria-label="gotadmin,
+ section 1">gotadmin(1)</a>. Git repository server functionality is provided
+ by <a class="Xr" aria-label="gotd, section 8">gotd(8)</a>. A repository
+ interface for web browsers is provided by <a class="Xr" aria-label="gotwebd,
+ section 8">gotwebd(8)</a>. An interactive repository interface for the
+ terminal is provided by <a class="Xr" aria-label="tog, section
+ 1">tog(1)</a>.</p>
<p class="Pp">The commands for <code class="Nm">got</code> are as follows:</p>
<dl class="Bl-tag">
+ <dt id="init"><a class="permalink" href="#init"><code class="Cm">init</code></a>
+ [<code class="Fl">-b</code> <var class="Ar">branch</var>]
+ <var class="Ar">repository-path</var></dt>
+ <dd>Create a new empty repository at the specified
+ <var class="Ar">repository-path</var>.
+ <p class="Pp">After <code class="Cm">got init</code>, the new repository
+ must be populated before <code class="Cm">got checkout</code> can be
+ used. The <code class="Cm">got import</code> command can be used to
+ populate the new repository with data from a local directory.
+ Alternatively, on a server running <a class="Xr" aria-label="gotd,
+ section 8">gotd(8)</a>, the new repository can be made available to
+ <a class="Xr" aria-label="got, section 1">got(1)</a> or
+ <a class="Xr" aria-label="git, section 1">git(1)</a> clients by adding
+ the repository to <a class="Xr" aria-label="gotd.conf, section
+ 5">gotd.conf(5)</a> and restarting <a class="Xr" aria-label="gotd,
+ section 8">gotd(8)</a>. Clients may then clone the new repository from
+ the server, populate the cloned repository, and then populate the new
+ repository on the server via <code class="Cm">got send</code> or
+ <code class="Cm">git push</code>.</p>
+ <p class="Pp">The options for <code class="Cm">got init</code> are as
+ follows:</p>
+ <dl class="Bl-tag">
+ <dt id="b"><a class="permalink" href="#b"><code class="Fl">-b</code></a>
+ <var class="Ar">branch</var></dt>
+ <dd>Make the repository's HEAD reference point to the specified
+ <var class="Ar">branch</var> instead of the default branch
+ “main”.</dd>
+ </dl>
+ <p class="Pp">The <code class="Cm">got init</code> command is equivalent to
+ <code class="Cm">gotadmin init</code>.</p>
+ </dd>
<dt id="im"><a class="permalink" href="#import"><code class="Cm" id="import">import</code></a>
[<code class="Fl">-b</code> <var class="Ar">branch</var>]
[<code class="Fl">-I</code> <var class="Ar">pattern</var>]
<p class="Pp">The options for <code class="Cm">got import</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="b"><a class="permalink" href="#b"><code class="Fl">-b</code></a>
+ <dt id="b~2"><a class="permalink" href="#b~2"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Create the specified <var class="Ar">branch</var>. If this option is
not specified, a branch corresponding to the repository's HEAD
not specified, a branch resolved via the remote repository's HEAD
reference will be fetched. Cannot be used together with the
<code class="Fl">-b</code> option.</dd>
- <dt id="b~2"><a class="permalink" href="#b~2"><code class="Fl">-b</code></a>
+ <dt id="b~3"><a class="permalink" href="#b~3"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Fetch the specified <var class="Ar">branch</var> from the remote
repository's “refs/heads/” reference namespace. This
enabled by default for specific repositories in
<a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a>. Cannot
be used together with the <code class="Fl">-b</code> option.</dd>
- <dt id="b~3"><a class="permalink" href="#b~3"><code class="Fl">-b</code></a>
+ <dt id="b~4"><a class="permalink" href="#b~4"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Fetch the specified <var class="Ar">branch</var> from the remote
repository's “refs/heads/” reference namespace. This
<p class="Pp">The options for <code class="Cm">got checkout</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="b~4"><a class="permalink" href="#b~4"><code class="Fl">-b</code></a>
+ <dt id="b~5"><a class="permalink" href="#b~5"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Check out files from a commit on the specified
<var class="Ar">branch</var>. If this option is not specified, a
<p class="Pp">The options for <code class="Cm">got update</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="b~5"><a class="permalink" href="#b~5"><code class="Fl">-b</code></a>
+ <dt id="b~6"><a class="permalink" href="#b~6"><code class="Fl">-b</code></a>
<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
<p class="Pp">The options for <code class="Cm">got log</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="b~6"><a class="permalink" href="#b~6"><code class="Fl">-b</code></a></dt>
+ <dt id="b~7"><a class="permalink" href="#b~7"><code class="Fl">-b</code></a></dt>
<dd>Display individual commits which were merged into the current branch
from other branches. By default, <code class="Cm">got log</code> shows
the linear history of the current branch only.</dd>
<code class="Fl">-a</code> option is equivalent to listing all
branches with multiple <code class="Fl">-b</code> options. Cannot be
used together with the <code class="Fl">-b</code> option.</dd>
- <dt id="b~7"><a class="permalink" href="#b~7"><code class="Fl">-b</code></a>
+ <dt id="b~8"><a class="permalink" href="#b~8"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Send the specified <var class="Ar">branch</var> from the local
repository's “refs/heads/” reference namespace. This
populated with files, e.g. from a temporary CVS checkout located at
<span class="Pa">/tmp/src</span>:</p>
<p class="Pp"></p>
-<div class="Bd Bd-indent"><code class="Li">$ gotadmin init
+<div class="Bd Bd-indent"><code class="Li">$ got init
/var/git/src.git</code></div>
<div class="Bd Bd-indent"><code class="Li">$ got import -r /var/git/src.git -I
CVS -I obj /tmp/src</code></div>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - cb3bbe9a76b1b1a2a3847ef121bb202dafd63746
blob + 00db9e44a707116a7825094fde222c5148730cdf
--- got.conf.5.html
+++ got.conf.5.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - b42ff8aa59d400d3502ad9433b7263890ec0c355
blob + 2756e4c9e3ad28e901ab436b2fc4d6f72ff69d71
--- gotadmin.1.html
+++ gotadmin.1.html
<var class="Ar">repository-path</var></dt>
<dd>Create a new empty repository at the specified
<var class="Ar">repository-path</var>.
- <p class="Pp">After <code class="Cm">gotadmin init</code>, the
- <code class="Cm">got import</code> command must be used to populate the
- empty repository before <code class="Cm">got checkout</code> can be
- used.</p>
+ <p class="Pp">After <code class="Cm">gotadmin init</code>, the new
+ repository must be populated before <code class="Cm">got checkout</code>
+ can be used. The <code class="Cm">got import</code> command can be used
+ to populate the new repository with data from a local directory.
+ Alternatively, on a server running <a class="Xr" aria-label="gotd,
+ section 8">gotd(8)</a>, the new repository can be made available to
+ <a class="Xr" aria-label="got, section 1">got(1)</a> or
+ <a class="Xr" aria-label="git, section 1">git(1)</a> clients by adding
+ the repository to <a class="Xr" aria-label="gotd.conf, section
+ 5">gotd.conf(5)</a> and restarting <a class="Xr" aria-label="gotd,
+ section 8">gotd(8)</a>. Clients may then clone the new repository from
+ the server, populate the cloned repository, and then populate the new
+ repository on the server via <code class="Cm">got send</code> or
+ <code class="Cm">git push</code>.</p>
<p class="Pp">The options for <code class="Cm">gotadmin init</code> are as
follows:</p>
<dl class="Bl-tag">
<var class="Ar">branch</var> instead of the default branch
“main”.</dd>
</dl>
+ <p class="Pp">The <code class="Cm">gotadmin init</code> command is
+ equivalent to <code class="Cm">got init</code>.</p>
</dd>
<dt id="info"><a class="permalink" href="#info"><code class="Cm">info</code></a>
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]</dt>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - a7a957740ed2061bc8972effde4a42d20021334a
blob + d9ab4657dd91a54d05144c52c6082dba5972e97c
--- gotctl.8.html
+++ gotctl.8.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - 23055ac120108fd294c7f3473d3c71683ec3c1ec
blob + d27de00f2eacf5ff494948cf04e9cb0d6e2ce22f
--- gotd.8.html
+++ gotd.8.html
</dl>
</section>
<section class="Sh">
+<h2 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h2>
+<p class="Pp">Create an empty repository to be served by
+ <code class="Nm">gotd</code>, ensuring that it can only be accessed by the
+ _gotd user:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li"># mkdir -p
+ /git/myrepo.git</code></div>
+<div class="Bd Bd-indent"><code class="Li"># chmod 700
+ /git/myrepo.git</code></div>
+<div class="Bd Bd-indent"><code class="Li"># chown _gotd
+ /git/myrepo.git</code></div>
+<div class="Bd Bd-indent"><code class="Li"># su -m _gotd -c 'gotadmin init
+ /git/myrepo.git'</code></div>
+<p class="Pp">Add the new repository to <a class="Xr" aria-label="gotd.conf,
+ section 5">gotd.conf(5)</a> granting read-write access to the flan_hacker
+ user account, and restart <code class="Nm">gotd</code>:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li"># cat >> /etc/gotd.conf
+ <<EOF</code></div>
+<div class="Bd Bd-indent"><code class="Li">repository 'myrepo' {</code></div>
+<div class="Bd Bd-indent"><code class="Li">path '/git/myrepo.git'</code></div>
+<div class="Bd Bd-indent"><code class="Li">permit rw flan_hacker</code></div>
+<div class="Bd Bd-indent"><code class="Li">}</code></div>
+<div class="Bd Bd-indent"><code class="Li">EOF</code></div>
+<div class="Bd Bd-indent"><code class="Li"># rcctl restart gotd</code></div>
+<p class="Pp">The flan_hacker user can now populate the empty repository with
+ <code class="Cm">got send</code>.</p>
+</section>
+<section class="Sh">
<h2 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h2>
<p class="Pp"><a class="Xr" aria-label="got, section 1">got(1)</a>,
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - 5c46d031257966a5ab587692aa730a16f71dc2f9
blob + a299c1982e254d6378a168c4fbef2d34418c62c0
--- gotd.conf.5.html
+++ gotd.conf.5.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - cc433ea0aa641f9a2aa00e604cee893480d558d7
blob + 8871bfbb19c4dc2902c1c0d1957b19af23200686
--- gotsh.1.html
+++ gotsh.1.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - 67e752267bdc6f69fa849f36c9a863d258f230c2
blob + fe6d517f78fc7909352e048d9efb4f7ded797f29
--- gotwebd.8.html
+++ gotwebd.8.html
<dt><span class="Pa">/var/www/htdocs/gotwebd/</span></dt>
<dd>Directory containing HTML, CSS, and image files used by
<code class="Nm">gotwebd</code>.</dd>
+ <dt><span class="Pa">/var/www/run/gotweb.sock</span></dt>
+ <dd>Default location for the <code class="Nm">gotwebd</code> listening
+ socket.</dd>
<dt><span class="Pa">/tmp/</span></dt>
<dd>Directory for temporary files created by
<code class="Nm">gotwebd</code>.</dd>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - df1924790c646b4691bc170c03bf5e2680d62447
blob + 21fe0989bbe7802c5dcfbf97796def829bb6dbb9
--- gotwebd.conf.5.html
+++ gotwebd.conf.5.html
<var class="Ar">path</var></dt>
<dd>Set the path to the <a class="Xr" aria-label="chroot, section
2">chroot(2)</a> environment of <a class="Xr" aria-label="httpd, section
- 8">httpd(8)</a>. If not specified then <span class="Pa">/var/www</span>
- will be used.</dd>
+ 8">httpd(8)</a>. If not specified, it defaults to
+ <span class="Pa">/var/www</span>, the home directory of the www user.</dd>
+ <dt id="listen"><a class="permalink" href="#listen"><code class="Ic">listen
+ on</code></a> <var class="Ar">address</var> <code class="Ic">port</code>
+ <var class="Ar">number</var></dt>
+ <dd>Configure an address and port for incoming FastCGI connections. Valid
+ <var class="Ar">address</var> arguments are hostnames, IPv4 and IPv6
+ addresses. The <var class="Ar">port</var> argument may be number or a
+ service name defined in <a class="Xr" aria-label="services, section
+ 5">services(5)</a>. May be specified multiple times to build up a list of
+ listening sockets.</dd>
+ <dt id="listen~2"><a class="permalink" href="#listen~2"><code class="Ic">listen
+ on socket</code></a> <var class="Ar">path</var></dt>
+ <dd>Configure a <span class="Ux">UNIX</span>-domain socket for incoming
+ FastCGI connections. May be specified multiple times to build up a list of
+ listening sockets.</dd>
<dt id="prefork"><a class="permalink" href="#prefork"><code class="Ic">prefork</code></a>
<var class="Ar">number</var></dt>
<dd>Run the specified number of server processes.
<a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a> runs 3 server
processes by default.</dd>
- <dt id="unix_socket"><a class="permalink" href="#unix_socket"><code class="Ic">unix_socket</code></a>
- <var class="Ar">on</var> | <var class="Ar">off</var></dt>
- <dd>Controls whether the servers will listen on unix sockets by default.
- Listening on unix sockets is the default.</dd>
- <dt id="unix_socket_name"><a class="permalink" href="#unix_socket_name"><code class="Ic">unix_socket_name</code></a>
- <var class="Ar">path</var></dt>
- <dd>Set the path to the default unix socket. Defaults to
- <span class="Pa">/var/www/run/gotweb.sock</span>.</dd>
+ <dt id="user"><a class="permalink" href="#user"><code class="Ic">user</code></a>
+ <var class="Ar">user</var></dt>
+ <dd>Set the <var class="Ar">user</var> which will run
+ <a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a>. If not
+ specified, the user www will be used.</dd>
</dl>
+<p class="Pp">If no <code class="Ic">listen</code> directive is used,
+ <a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a> will listen on
+ the <span class="Ux">UNIX</span>-domain socket at
+ <span class="Pa">/var/www/run/gotweb.sock</span>.</p>
</section>
<section class="Sh">
<h2 class="Sh" id="SERVER_CONFIGURATION"><a class="permalink" href="#SERVER_CONFIGURATION">SERVER
<p class="Pp">At least one server context must exist for
<a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a> to function. In
case no server context is defined in the configuration file, a default
- server context will be used, which listens on a unix socket at
- <span class="Pa">/var/www/run/gotweb.sock</span> and uses default parameters
- for all applicable settings.</p>
+ server context will be used which uses default parameters for all applicable
+ settings.</p>
<p class="Pp">A server context is declared with a unique
<var class="Ar">name</var>, followed by server-specific configuration
directives inside curly braces:</p>
<dd>Set the path to a custom Cascading Style Sheet (CSS) to be used. If this
option is not specified then the default style sheet
‘gotweb.css’ will be used.</dd>
- <dt id="listen"><a class="permalink" href="#listen"><code class="Ic">listen
- on</code></a> <var class="Ar">address</var> <code class="Ic">port</code>
- <var class="Ar">number</var></dt>
- <dd>Configure an address and port for incoming FastCGI connections. Valid
- <var class="Ar">address</var> arguments are hostnames, IPv4 and IPv6
- addresses. The <var class="Ar">port</var> argument may be number or a
- service name defined in <a class="Xr" aria-label="services, section
- 5">services(5)</a>.
- <p class="Pp">May be specified multiple times to build up a list of
- listening sockets. However, a given combination of address and port may
- only be used by one server.</p>
- </dd>
- <dt id="listen~2"><a class="permalink" href="#listen~2"><code class="Ic">listen
- on socket off</code></a></dt>
- <dd>Disable use of unix socket.</dd>
- <dt id="listen~3"><a class="permalink" href="#listen~3"><code class="Ic">listen
- on socket</code></a> <var class="Ar">path</var></dt>
- <dd>Set the path to the unix socket used by the server.</dd>
<dt id="logo"><a class="permalink" href="#logo"><code class="Ic">logo</code></a>
<var class="Ar">path</var></dt>
<dd>Set the path to an image file containing a logo to be displayed. Defaults
<dt><span class="Pa">/etc/gotwebd.conf</span></dt>
<dd>Default location of the <code class="Nm">gotwebd.conf</code> configuration
file.</dd>
+ <dt><span class="Pa">/var/www/run/gotweb.sock</span></dt>
+ <dd>Default location for the <a class="Xr" aria-label="gotwebd, section
+ 8">gotwebd(8)</a> listening socket.</dd>
</dl>
</section>
<section class="Sh">
<p class="Pp">Another example, this time listening on a local port instead of
the implicit <span class="Ux">UNIX</span> socket.</p>
<div class="Bd Pp Bd-indent Li">
-<pre>server "localhost" {
- listen on socket off
- listen on 127.0.0.1 port 9000
- listen on ::1 port 9000
+<pre>listen on 127.0.0.1 port 9000
+listen on ::1 port 9000
+
+server "localhost" {
+ site_name "my public repos"
}</pre>
</div>
</section>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>
blob - 7a12c169c9a8f169919305485dcdf488e9b240fc
blob + 77900014e6de994d0f549f354bc283b107b66378
--- tog.1.html
+++ tog.1.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">May 6,
+ line"><span class="foot-left"></span><span class="foot-date">June 3,
2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
</body>
</html>