commit - dd675f79fe56ceed41af67f24a651b5d6f5644da
commit + 63657f42eb5781789e879bb9f2b95bcbca4e4db1
blob - 6b2c66e07530a7932733f983554356edfe133619
blob + 9617ef0974234d6719c79df6a1611c2b553a04d5
--- git-repository.5.html
+++ git-repository.5.html
<!DOCTYPE html>
<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>GIT-REPOSITORY(5)</title>
+</head>
<!-- This is an automatically generated file. Do not edit.
Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
- <title>GIT-REPOSITORY(5)</title>
-</head>
<body>
-<table class="head">
- <tr>
- <td class="head-ltitle">GIT-REPOSITORY(5)</td>
- <td class="head-vol">File Formats Manual</td>
- <td class="head-rtitle">GIT-REPOSITORY(5)</td>
- </tr>
-</table>
-<div class="manual-text">
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">GIT-REPOSITORY(5)</span>
+ <span class="head-vol">File Formats Manual</span>
+ <span class="head-rtitle">GIT-REPOSITORY(5)</span></div>
+<main class="manual-text">
<section class="Sh">
-<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
<p class="Pp"><code class="Nm">git-repository</code> —
- <span class="Nd">Git repository format</span></p>
+ <span class="Nd" role="doc-subtitle">Git repository format</span></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
<p class="Pp">A Git repository stores a series of versioned snapshots of a file
hierarchy. Conceptually, the repository's data model is a directed acyclic
graph which contains three types of objects as nodes:</p>
object's header and the data stored in the object.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="OBJECT_STORAGE"><a class="permalink" href="#OBJECT_STORAGE">OBJECT
- STORAGE</a></h1>
+<h2 class="Sh" id="OBJECT_STORAGE"><a class="permalink" href="#OBJECT_STORAGE">OBJECT
+ STORAGE</a></h2>
<p class="Pp">Loose objects are stored as individual files beneath the directory
<span class="Pa">objects</span>, spread across 256 sub-directories named
after the 256 possible hexadecimal values of the first byte of an object
objects contained in the pack file.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="REFERENCES"><a class="permalink" href="#REFERENCES">REFERENCES</a></h1>
+<h2 class="Sh" id="REFERENCES"><a class="permalink" href="#REFERENCES">REFERENCES</a></h2>
<p class="Pp">A reference associates a name with an object ID. A prominent use
of references is providing names to branches in the repository by pointing
at commit objects which represent the current tip commit of a branch.
<code class="Cm">gotadmin cleanup</code>.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h1>
+<h2 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h2>
<dl class="Bl-tag Bl-compact">
<dt><span class="Pa">HEAD</span></dt>
<dd>A reference to the current head commit of the Git work tree. In bare
bare.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
- ALSO</a></h1>
+<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>,
<a class="Xr" aria-label="gotadmin, section 1">gotadmin(1)</a>,
<a class="Xr" aria-label="deflate, section 3">deflate(3)</a>,
<a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="HISTORY"><a class="permalink" href="#HISTORY">HISTORY</a></h1>
+<h2 class="Sh" id="HISTORY"><a class="permalink" href="#HISTORY">HISTORY</a></h2>
<p class="Pp">The Git repository format was initially designed by Linus Torvalds
in 2005 and has since been extended by various people involved in the
development of the Git version control system.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h1>
+<h2 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h2>
<p class="Pp">The particular set of disallowed characters in reference names is
a consequence of design choices made for the command-line interface of
<a class="Xr" aria-label="git, section 1">git(1)</a>. The same characters
users from creating reference names with a leading - (dash) character,
because this is rarely intended and not considered useful.</p>
</section>
-</div>
-<table class="foot">
- <tr>
- <td class="foot-date">July 14, 2022</td>
- <td class="foot-os">OpenBSD 7.1</td>
- </tr>
-</table>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
</body>
</html>
blob - 54061f0699cf4b3f3c890ea6a4a6578d8ada4b61
blob + 228a4c372c9b3ecfdc48eb29ede60f7c2d834247
--- got-worktree.5.html
+++ got-worktree.5.html
<!DOCTYPE html>
<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>GOT-WORKTREE(5)</title>
+</head>
<!-- This is an automatically generated file. Do not edit.
Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
- <title>GOT-WORKTREE(5)</title>
-</head>
<body>
-<table class="head">
- <tr>
- <td class="head-ltitle">GOT-WORKTREE(5)</td>
- <td class="head-vol">File Formats Manual</td>
- <td class="head-rtitle">GOT-WORKTREE(5)</td>
- </tr>
-</table>
-<div class="manual-text">
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">GOT-WORKTREE(5)</span>
+ <span class="head-vol">File Formats Manual</span>
+ <span class="head-rtitle">GOT-WORKTREE(5)</span></div>
+<main class="manual-text">
<section class="Sh">
-<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
<p class="Pp"><code class="Nm">got-worktree</code> —
- <span class="Nd">Game of Trees work tree format</span></p>
+ <span class="Nd" role="doc-subtitle">Game of Trees work tree
+ format</span></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
<p class="Pp">A Got
<a class="permalink" href="#work"><i class="Em" id="work">work tree</i></a>
stores a file hierarchy which corresponds to a versioned snapshot stored in
Git repository with <code class="Cm">got ref -d</code>.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h1>
+<h2 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h2>
<dl class="Bl-tag Bl-compact">
<dt><span class="Pa">.got</span></dt>
<dd>Meta-data directory where all files listed below reside.</dd>
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
- ALSO</a></h1>
+<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>,
<a class="Xr" aria-label="rename, section 2">rename(2)</a>,
<a class="Xr" aria-label="stat, section 2">stat(2)</a>,
<a class="Xr" aria-label="git-repository, section 5">git-repository(5)</a>,
<a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a></p>
</section>
-</div>
-<table class="foot">
- <tr>
- <td class="foot-date">July 14, 2022</td>
- <td class="foot-os">OpenBSD 7.1</td>
- </tr>
-</table>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
</body>
</html>
blob - 9f9062957516a8748193b5f18c9b5595648c4671
blob + deb7b96a700baacc2986f99ccb774156ae88537c
--- got.1.html
+++ got.1.html
<!DOCTYPE html>
<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>GOT(1)</title>
+</head>
<!-- This is an automatically generated file. Do not edit.
Copyright (c) 2017 Martin Pieuchot
Copyright (c) 2018, 2019, 2020 Stefan Sperling
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
- <title>GOT(1)</title>
-</head>
<body>
-<table class="head">
- <tr>
- <td class="head-ltitle">GOT(1)</td>
- <td class="head-vol">General Commands Manual</td>
- <td class="head-rtitle">GOT(1)</td>
- </tr>
-</table>
-<div class="manual-text">
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">GOT(1)</span> <span class="head-vol">General
+ Commands Manual</span> <span class="head-rtitle">GOT(1)</span></div>
+<main class="manual-text">
<section class="Sh">
-<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<p class="Pp"><code class="Nm">got</code> — <span class="Nd">Game of
- Trees</span></p>
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
+<p class="Pp"><code class="Nm">got</code> —
+ <span class="Nd" role="doc-subtitle">Game of Trees</span></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h1>
+<h2 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h2>
<table class="Nm">
<tr>
<td><code class="Nm">got</code></td>
</table>
</section>
<section class="Sh">
-<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
<p class="Pp"><code class="Nm">got</code> is a version control system which
stores the history of tracked files in a Git repository, as used by the Git
version control system. This repository format is described in
<dl class="Bl-tag">
<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>]
[<code class="Fl">-m</code> <var class="Ar">message</var>]
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
- [<code class="Fl">-I</code> <var class="Ar">pattern</var>]
<var class="Ar">directory</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<dd>Create the specified <var class="Ar">branch</var> instead of creating
the default branch “main”. Use of this option is
required if the “main” branch already exists.</dd>
+ <dt id="I"><a class="permalink" href="#I"><code class="Fl">-I</code></a>
+ <var class="Ar">pattern</var></dt>
+ <dd>Ignore files or directories with a name which matches the specified
+ <var class="Ar">pattern</var>. This option may be specified multiple
+ times to build a list of ignore patterns. The
+ <var class="Ar">pattern</var> follows the globbing rules documented in
+ <a class="Xr" aria-label="glob, section 7">glob(7)</a>.</dd>
<dt id="m"><a class="permalink" href="#m"><code class="Fl">-m</code></a>
<var class="Ar">message</var></dt>
<dd>Use the specified log message when creating the new commit. Without
<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.</dd>
- <dt id="I"><a class="permalink" href="#I"><code class="Fl">-I</code></a>
- <var class="Ar">pattern</var></dt>
- <dd>Ignore files or directories with a name which matches the specified
- <var class="Ar">pattern</var>. This option may be specified multiple
- times to build a list of ignore patterns. The
- <var class="Ar">pattern</var> follows the globbing rules documented in
- <a class="Xr" aria-label="glob, section 7">glob(7)</a>.</dd>
</dl>
</dd>
<dt id="cl"><a class="permalink" href="#clone"><code class="Cm" id="clone">clone</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-b</code>
- <var class="Ar">branch</var>] [<code class="Fl">-l</code>]
- [<code class="Fl">-m</code>] [<code class="Fl">-q</code>]
- [<code class="Fl">-v</code>] [<code class="Fl">-R</code>
+ [<code class="Fl">-almqv</code>] [<code class="Fl">-b</code>
+ <var class="Ar">branch</var>] [<code class="Fl">-R</code>
<var class="Ar">reference</var>] <var class="Ar">repository-URL</var>
[<var class="Ar">directory</var>]</dt>
<dd>
<dd>Suppress progress reporting output. The same option will be passed to
<a class="Xr" aria-label="ssh, section 1">ssh(1)</a> if
applicable.</dd>
- <dt id="v"><a class="permalink" href="#v"><code class="Fl">-v</code></a></dt>
- <dd>Verbose mode. Causes <code class="Cm">got clone</code> to print
- debugging messages to standard error output. This option will be
- passed to <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> if
- applicable. Multiple -v options increase the verbosity. The maximum is
- 3.</dd>
<dt id="R"><a class="permalink" href="#R"><code class="Fl">-R</code></a>
<var class="Ar">reference</var></dt>
<dd>In addition to the branches and tags that will be fetched, fetch an
“refs/remotes/” or “refs/got/”
namespace.</p>
</dd>
+ <dt id="v"><a class="permalink" href="#v"><code class="Fl">-v</code></a></dt>
+ <dd>Verbose mode. Causes <code class="Cm">got clone</code> to print
+ debugging messages to standard error output. This option will be
+ passed to <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> if
+ applicable. Multiple -v options increase the verbosity. The maximum is
+ 3.</dd>
</dl>
</dd>
<dt id="fe"><a class="permalink" href="#fetch"><code class="Cm" id="fetch">fetch</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-b</code>
- <var class="Ar">branch</var>] [<code class="Fl">-d</code>]
- [<code class="Fl">-l</code>] [<code class="Fl">-r</code>
- <var class="Ar">repository-path</var>] [<code class="Fl">-t</code>]
- [<code class="Fl">-q</code>] [<code class="Fl">-v</code>]
- [<code class="Fl">-R</code> <var class="Ar">reference</var>]
- [<code class="Fl">-X</code>] [<var class="Ar">remote-repository</var>]</dt>
+ [<code class="Fl">-adlqtvX</code>] [<code class="Fl">-b</code>
+ <var class="Ar">branch</var>] [<code class="Fl">-R</code>
+ <var class="Ar">reference</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>]
+ [<var class="Ar">remote-repository</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">fe</code>)</code></div>
repository and exit immediately. Cannot be used together with any of
the other options except <code class="Fl">-v</code>,
<code class="Fl">-q</code>, and <code class="Fl">-r</code>.</dd>
- <dt id="t"><a class="permalink" href="#t"><code class="Fl">-t</code></a></dt>
- <dd>Allow existing references in the “refs/tags” namespace
- to be updated if they have changed on the server. If not specified,
- only new tag references will be created.</dd>
- <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
- this directory is a <code class="Nm">got</code> work tree, use the
- repository path associated with this work tree.</dd>
<dt id="q~2"><a class="permalink" href="#q~2"><code class="Fl">-q</code></a></dt>
<dd>Suppress progress reporting output. The same option will be passed to
<a class="Xr" aria-label="ssh, section 1">ssh(1)</a> if
applicable.</dd>
- <dt id="v~2"><a class="permalink" href="#v~2"><code class="Fl">-v</code></a></dt>
- <dd>Verbose mode. Causes <code class="Cm">got fetch</code> to print
- debugging messages to standard error output. The same option will be
- passed to <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> if
- applicable. Multiple -v options increase the verbosity. The maximum is
- 3.</dd>
<dt id="R~2"><a class="permalink" href="#R~2"><code class="Fl">-R</code></a>
<var class="Ar">reference</var></dt>
<dd>In addition to the branches and tags that will be fetched, fetch an
“refs/remotes/” or “refs/got/”
namespace.</p>
</dd>
+ <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
+ this directory is a <code class="Nm">got</code> work tree, use the
+ repository path associated with this work tree.</dd>
+ <dt id="t"><a class="permalink" href="#t"><code class="Fl">-t</code></a></dt>
+ <dd>Allow existing references in the “refs/tags” namespace
+ to be updated if they have changed on the server. If not specified,
+ only new tag references will be created.</dd>
+ <dt id="v~2"><a class="permalink" href="#v~2"><code class="Fl">-v</code></a></dt>
+ <dd>Verbose mode. Causes <code class="Cm">got fetch</code> to print
+ debugging messages to standard error output. The same option will be
+ passed to <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> if
+ applicable. Multiple -v options increase the verbosity. The maximum is
+ 3.</dd>
<dt id="X"><a class="permalink" href="#X"><code class="Fl">-X</code></a></dt>
<dd>Delete all references which correspond to a particular
<var class="Ar">remote-repository</var> instead of fetching new
</dl>
</dd>
<dt id="co"><a class="permalink" href="#checkout"><code class="Cm" id="checkout">checkout</code></a>
- [<code class="Fl">-E</code>] [<code class="Fl">-b</code>
+ [<code class="Fl">-Eq</code>] [<code class="Fl">-b</code>
<var class="Ar">branch</var>] [<code class="Fl">-c</code>
<var class="Ar">commit</var>] [<code class="Fl">-p</code>
- <var class="Ar">path-prefix</var>] [<code class="Fl">-q</code>]
- <var class="Ar">repository-path</var>
+ <var class="Ar">path-prefix</var>] <var class="Ar">repository-path</var>
[<var class="Ar">work-tree-path</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<p class="Pp">The options for <code class="Cm">got checkout</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="E"><a class="permalink" href="#E"><code class="Fl">-E</code></a></dt>
- <dd>Proceed with the checkout operation even if the directory at
- <var class="Ar">work-tree-path</var> is not empty. Existing files will
- be left intact.</dd>
<dt id="b~4"><a class="permalink" href="#b~4"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Check out files from a commit on the specified
<code class="Cm">got checkout</code> can be used. Checking out work
trees with an unknown branch is intentionally not supported.</p>
</dd>
+ <dt id="E"><a class="permalink" href="#E"><code class="Fl">-E</code></a></dt>
+ <dd>Proceed with the checkout operation even if the directory at
+ <var class="Ar">work-tree-path</var> is not empty. Existing files will
+ be left intact.</dd>
<dt id="p"><a class="permalink" href="#p"><code class="Fl">-p</code></a>
<var class="Ar">path-prefix</var></dt>
<dd>Restrict the work tree to a subset of the repository's tree hierarchy.
</dl>
</dd>
<dt id="up"><a class="permalink" href="#update"><code class="Cm" id="update">update</code></a>
- [<code class="Fl">-b</code> <var class="Ar">branch</var>]
- [<code class="Fl">-c</code> <var class="Ar">commit</var>]
- [<code class="Fl">-q</code>] [<var class="Ar">path ...</var>]</dt>
+ [<code class="Fl">-q</code>] [<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>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">up</code>)</code></div>
</dl>
</dd>
<dt id="st"><a class="permalink" href="#status"><code class="Cm" id="status">status</code></a>
- [<code class="Fl">-I</code>] [<code class="Fl">-s</code>
- <var class="Ar">status-codes</var>] [<code class="Fl">-S</code>
+ [<code class="Fl">-I</code>] [<code class="Fl">-S</code>
+ <var class="Ar">status-codes</var>] [<code class="Fl">-s</code>
<var class="Ar">status-codes</var>] [<var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<dl class="Bl-tag">
<dt id="I~2"><a class="permalink" href="#I~2"><code class="Fl">-I</code></a></dt>
<dd>Show unversioned files even if they match an ignore pattern.</dd>
- <dt id="s"><a class="permalink" href="#s"><code class="Fl">-s</code></a>
- <var class="Ar">status-codes</var></dt>
- <dd>Only show files with a modification status matching any of the
- single-character status codes contained in the
- <var class="Ar">status-codes</var> argument. Any combination of codes
- from the above list of possible status codes may be specified. For
- staged files, status codes displayed in either column will be matched.
- Cannot be used together with the <code class="Fl">-S</code>
- option.</dd>
<dt id="S"><a class="permalink" href="#S"><code class="Fl">-S</code></a>
<var class="Ar">status-codes</var></dt>
<dd>Suppress the output of files with a modification status matching any
staged files, status codes displayed in either column will be matched.
Cannot be used together with the <code class="Fl">-s</code>
option.</dd>
+ <dt id="s"><a class="permalink" href="#s"><code class="Fl">-s</code></a>
+ <var class="Ar">status-codes</var></dt>
+ <dd>Only show files with a modification status matching any of the
+ single-character status codes contained in the
+ <var class="Ar">status-codes</var> argument. Any combination of codes
+ from the above list of possible status codes may be specified. For
+ staged files, status codes displayed in either column will be matched.
+ Cannot be used together with the <code class="Fl">-S</code>
+ option.</dd>
</dl>
<p class="Pp">For compatibility with <a class="Xr" aria-label="cvs, section
1">cvs(1)</a> and <a class="Xr" aria-label="git, section 1">git(1)</a>,
“/”, in a pattern.</p>
</dd>
<dt id="log"><a class="permalink" href="#log"><code class="Cm">log</code></a>
- [<code class="Fl">-b</code>] [<code class="Fl">-c</code>
- <var class="Ar">commit</var>] [<code class="Fl">-C</code>
- <var class="Ar">number</var>] [<code class="Fl">-l</code>
- <var class="Ar">N</var>] [<code class="Fl">-p</code>]
- [<code class="Fl">-P</code>] [<code class="Fl">-s</code>]
- [<code class="Fl">-S</code> <var class="Ar">search-pattern</var>]
- [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
- [<code class="Fl">-R</code>] [<code class="Fl">-x</code>
+ [<code class="Fl">-bPpRs</code>] [<code class="Fl">-C</code>
+ <var class="Ar">number</var>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-l</code>
+ <var class="Ar">N</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<code class="Fl">-S</code>
+ <var class="Ar">search-pattern</var>] [<code class="Fl">-x</code>
<var class="Ar">commit</var>] [<var class="Ar">path</var>]</dt>
<dd>Display history of a repository. If a <var class="Ar">path</var> is
specified, show only commits which modified this path. If invoked in a
<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>
+ <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 diffs with
+ <code class="Fl">-p</code>. By default, 3 lines of context are
+ shown.</dd>
<dt id="c~3"><a class="permalink" href="#c~3"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Start traversing history at the specified
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="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 diffs with
- <code class="Fl">-p</code>. By default, 3 lines of context are
- shown.</dd>
<dt id="l~3"><a class="permalink" href="#l~3"><code class="Fl">-l</code></a>
<var class="Ar">N</var></dt>
<dd>Limit history traversal to a given number of commits. If this option
treated as an unbounded limit. The
<code class="Ev">GOT_LOG_DEFAULT_LIMIT</code> environment variable may
be set to change this default value.</dd>
- <dt id="p~2"><a class="permalink" href="#p~2"><code class="Fl">-p</code></a></dt>
- <dd>Display the patch of modifications made in each commit. If a
- <var class="Ar">path</var> is specified, only show the patch of
- modifications at or within this path. Cannot be used with the
- <code class="Fl">-s</code> option.</dd>
<dt id="P"><a class="permalink" href="#P"><code class="Fl">-P</code></a></dt>
<dd>Display the list of file paths changed in each commit, using the
following status codes:
<p class="Pp">Cannot be used with the <code class="Fl">-s</code>
option.</p>
</dd>
- <dt id="s~2"><a class="permalink" href="#s~2"><code class="Fl">-s</code></a></dt>
- <dd>Display a short one-line summary of each commit, instead of the
- default history format. Cannot be used together with the
- <code class="Fl">-p</code> or <code class="Fl">-P</code> option.</dd>
+ <dt id="p~2"><a class="permalink" href="#p~2"><code class="Fl">-p</code></a></dt>
+ <dd>Display the patch of modifications made in each commit. If a
+ <var class="Ar">path</var> is specified, only show the patch of
+ modifications at or within this path. Cannot be used with the
+ <code class="Fl">-s</code> option.</dd>
+ <dt id="R~3"><a class="permalink" href="#R~3"><code class="Fl">-R</code></a></dt>
+ <dd>Determine a set of commits to display as usual, but display these
+ commits in reverse order.</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 <code class="Nm">got</code> work tree, use the
+ repository path associated with this work tree.</dd>
<dt id="S~2"><a class="permalink" href="#S~2"><code class="Fl">-S</code></a>
<var class="Ar">search-pattern</var></dt>
<dd>If specified, show only commits with a log message, author name,
<code class="Fl">-P</code> is specified. Regular expression syntax is
documented in <a class="Xr" aria-label="re_format, section
7">re_format(7)</a>.</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 <code class="Nm">got</code> work tree, use the
- repository path associated with this work tree.</dd>
- <dt id="R~3"><a class="permalink" href="#R~3"><code class="Fl">-R</code></a></dt>
- <dd>Determine a set of commits to display as usual, but display these
- commits in reverse order.</dd>
+ <dt id="s~2"><a class="permalink" href="#s~2"><code class="Fl">-s</code></a></dt>
+ <dd>Display a short one-line summary of each commit, instead of the
+ default history format. Cannot be used together with the
+ <code class="Fl">-p</code> or <code class="Fl">-P</code> option.</dd>
<dt id="x"><a class="permalink" href="#x"><code class="Fl">-x</code></a>
<var class="Ar">commit</var></dt>
<dd>Stop traversing commit history immediately after the specified
</dl>
</dd>
<dt id="di"><a class="permalink" href="#diff"><code class="Cm" id="diff">diff</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-c</code>
- <var class="Ar">commit</var>] [<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">-P</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">-aPsw</code>] [<code class="Fl">-C</code>
+ <var class="Ar">number</var>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<var class="Ar">object1</var>
+ <var class="Ar">object2</var> | <var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">di</code>)</code></div>
<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
+ of context are shown.</dd>
<dt id="c~4"><a class="permalink" href="#c~4"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
- <dd>Show differences between commits in the repository. This options may
- be used up to two times. When used only once, show differences between
+ <dd>Show differences between commits in the repository. This option may be
+ used up to two times. When used only once, show differences between
the specified <var class="Ar">commit</var> and its first parent
commit. When used twice, show differences between the two specified
commits.
<p class="Pp">Cannot be used together with the
<code class="Fl">-P</code> option.</p>
</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
- of context are shown.</dd>
+ <dt id="P~2"><a class="permalink" href="#P~2"><code class="Fl">-P</code></a></dt>
+ <dd>Interpret all arguments as paths only. This option can be used to
+ resolve ambiguity in cases where paths look like tag names, reference
+ names, or object IDs. This option is only valid when
+ <code class="Cm">got diff</code> is invoked in a work tree.</dd>
<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
<dd>Show changes staged with <code class="Cm">got stage</code> instead of
showing local changes in the work tree. This option is only valid when
<code class="Cm">got diff</code> is invoked in a work tree.</dd>
- <dt id="P~2"><a class="permalink" href="#P~2"><code class="Fl">-P</code></a></dt>
- <dd>Interpret all arguments as paths only. This option can be used to
- resolve ambiguity in cases where paths look like tag names, reference
- names, or object IDs. This option is only valid when
- <code class="Cm">got diff</code> is invoked in a work tree.</dd>
<dt id="w"><a class="permalink" href="#w"><code class="Fl">-w</code></a></dt>
<dd>Ignore whitespace-only changes.</dd>
</dl>
</dl>
</dd>
<dt id="tr"><a class="permalink" href="#tree"><code class="Cm" id="tree">tree</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">-i</code>] [<code class="Fl">-R</code>]
- [<var class="Ar">path</var>]</dt>
+ [<code class="Fl">-iR</code>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<var class="Ar">path</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">tr</code>)</code></div>
to a commit ID. An abbreviated hash argument will be expanded to a
full SHA1 hash automatically, provided the abbreviation is
unique.</dd>
+ <dt id="i"><a class="permalink" href="#i"><code class="Fl">-i</code></a></dt>
+ <dd>Show object IDs of files (blob objects) and directories (tree
+ objects).</dd>
+ <dt id="R~4"><a class="permalink" href="#R~4"><code class="Fl">-R</code></a></dt>
+ <dd>Recurse into sub-directories in the repository.</dd>
<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 <code class="Nm">got</code> work tree, use the
repository path associated with this work tree.</dd>
- <dt id="i"><a class="permalink" href="#i"><code class="Fl">-i</code></a></dt>
- <dd>Show object IDs of files (blob objects) and directories (tree
- objects).</dd>
- <dt id="R~4"><a class="permalink" href="#R~4"><code class="Fl">-R</code></a></dt>
- <dd>Recurse into sub-directories in the repository.</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>]
- [<code class="Fl">-l</code>] [<code class="Fl">-t</code>]
- [<code class="Fl">-c</code> <var class="Ar">object</var>]
- [<code class="Fl">-s</code> <var class="Ar">reference</var>]
- [<code class="Fl">-d</code>] [<var class="Ar">name</var>]</dt>
+ [<code class="Fl">-dlt</code>] [<code class="Fl">-c</code>
+ <var class="Ar">object</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<code class="Fl">-s</code>
+ <var class="Ar">reference</var>] [<var class="Ar">name</var>]</dt>
<dd>Manage references in a repository.
<p class="Pp">References may be listed, created, deleted, and changed. When
creating, deleting, or changing a reference the specified
<p class="Pp">The options for <code class="Cm">got 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
- this directory is a <code class="Nm">got</code> work tree, use the
- repository path associated with this work tree.</dd>
- <dt id="l~4"><a class="permalink" href="#l~4"><code class="Fl">-l</code></a></dt>
- <dd>List references in the repository. If no <var class="Ar">name</var> is
- specified, list all existing references in the repository. If
- <var class="Ar">name</var> is a reference namespace, list all
- references in this namespace. Otherwise, show only the reference with
- the given <var class="Ar">name</var>. Cannot be used together with any
- other options except <code class="Fl">-r</code> and
- <code class="Fl">-t</code>.</dd>
- <dt id="t~2"><a class="permalink" href="#t~2"><code class="Fl">-t</code></a></dt>
- <dd>Sort listed references by modification time (most recently modified
- first) instead of sorting by lexicographical order. Use of this option
- requires the <code class="Fl">-l</code> option to be used as
- well.</dd>
<dt id="c~7"><a class="permalink" href="#c~7"><code class="Fl">-c</code></a>
<var class="Ar">object</var></dt>
<dd>Create a reference or change an existing reference. The reference with
corresponding commit, tree, tag, or blob object. Cannot be used
together with any other options except
<code class="Fl">-r</code>.</dd>
+ <dt id="d~2"><a class="permalink" href="#d~2"><code class="Fl">-d</code></a></dt>
+ <dd>Delete the reference with the specified <var class="Ar">name</var>
+ from the repository. Any commit, tree, tag, and blob objects belonging
+ to deleted references remain in the repository and may be removed
+ separately with Git's garbage collector or <code class="Cm">gotadmin
+ cleanup</code>. Cannot be used together with any other options except
+ <code class="Fl">-r</code>.</dd>
+ <dt id="l~4"><a class="permalink" href="#l~4"><code class="Fl">-l</code></a></dt>
+ <dd>List references in the repository. If no <var class="Ar">name</var> is
+ specified, list all existing references in the repository. If
+ <var class="Ar">name</var> is a reference namespace, list all
+ references in this namespace. Otherwise, show only the reference with
+ the given <var class="Ar">name</var>. Cannot be used together with any
+ other options except <code class="Fl">-r</code> and
+ <code class="Fl">-t</code>.</dd>
+ <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
+ this directory is a <code class="Nm">got</code> work tree, use the
+ repository path associated with this work tree.</dd>
<dt id="s~4"><a class="permalink" href="#s~4"><code class="Fl">-s</code></a>
<var class="Ar">reference</var></dt>
<dd>Create a symbolic reference, or change an existing symbolic reference.
loops between references when this option is used. Cannot be used
together with any other options except
<code class="Fl">-r</code>.</dd>
- <dt id="d~2"><a class="permalink" href="#d~2"><code class="Fl">-d</code></a></dt>
- <dd>Delete the reference with the specified <var class="Ar">name</var>
- from the repository. Any commit, tree, tag, and blob objects belonging
- to deleted references remain in the repository and may be removed
- separately with Git's garbage collector or <code class="Cm">gotadmin
- cleanup</code>. Cannot be used together with any other options except
- <code class="Fl">-r</code>.</dd>
+ <dt id="t~2"><a class="permalink" href="#t~2"><code class="Fl">-t</code></a></dt>
+ <dd>Sort listed references by modification time (most recently modified
+ first) instead of sorting by lexicographical order. Use of this option
+ requires the <code class="Fl">-l</code> option to be used as
+ well.</dd>
</dl>
</dd>
<dt id="br"><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">-t</code>]
- [<code class="Fl">-d</code> <var class="Ar">name</var>]
- [<code class="Fl">-n</code>] [<var class="Ar">name</var>]</dt>
+ [<code class="Fl">-lnt</code>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-d</code>
+ <var class="Ar">name</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<var class="Ar">name</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">br</code>)</code></div>
<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 id="r~8"><a class="permalink" href="#r~8"><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 <code class="Nm">got</code> work tree, use the
- repository path associated with this work tree.</dd>
+ <dt id="d~3"><a class="permalink" href="#d~3"><code class="Fl">-d</code></a>
+ <var class="Ar">name</var></dt>
+ <dd>Delete the branch with the specified <var class="Ar">name</var> from
+ the “refs/heads” or “refs/remotes”
+ reference namespace.
+ <p class="Pp">Only the branch reference is deleted. Any commit, tree,
+ and blob objects belonging to the branch remain in the repository
+ and may be removed separately with Git's garbage collector or
+ <code class="Cm">gotadmin cleanup</code>.</p>
+ </dd>
<dt id="l~5"><a class="permalink" href="#l~5"><code class="Fl">-l</code></a></dt>
<dd>List all existing branches in the repository, including copies of
remote repositories' branches in the “refs/remotes/”
</tr>
</table>
</dd>
+ <dt id="n"><a class="permalink" href="#n"><code class="Fl">-n</code></a></dt>
+ <dd>Do not switch and update the work tree after creating a new
+ branch.</dd>
+ <dt id="r~8"><a class="permalink" href="#r~8"><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 <code class="Nm">got</code> work tree, use the
+ repository path associated with this work tree.</dd>
<dt id="t~3"><a class="permalink" href="#t~3"><code class="Fl">-t</code></a></dt>
<dd>Sort listed branches by modification time (most recently modified
first) instead of sorting by lexicographical order. Branches in the
branches in “refs/remotes/” regardless. Use of this
option requires the <code class="Fl">-l</code> option to be used as
well.</dd>
- <dt id="d~3"><a class="permalink" href="#d~3"><code class="Fl">-d</code></a>
- <var class="Ar">name</var></dt>
- <dd>Delete the branch with the specified <var class="Ar">name</var> from
- the “refs/heads” or “refs/remotes”
- reference namespace.
- <p class="Pp">Only the branch reference is deleted. Any commit, tree,
- and blob objects belonging to the branch remain in the repository
- and may be removed separately with Git's garbage collector or
- <code class="Cm">gotadmin cleanup</code>.</p>
- </dd>
- <dt id="n"><a class="permalink" href="#n"><code class="Fl">-n</code></a></dt>
- <dd>Do not switch and update the work tree after creating a new
- branch.</dd>
</dl>
</dd>
<dt id="tag"><a class="permalink" href="#tag"><code class="Cm">tag</code></a>
- [<code class="Fl">-c</code> <var class="Ar">commit</var>]
- [<code class="Fl">-m</code> <var class="Ar">message</var>]
- [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
- [<code class="Fl">-l</code>] [<code class="Fl">-s</code>
- <var class="Ar">signer-id</var>] [<code class="Fl">-v</code>]
- [<code class="Fl">-V</code>] <var class="Ar">name</var></dt>
+ [<code class="Fl">-lVv</code>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-m</code>
+ <var class="Ar">message</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<code class="Fl">-s</code>
+ <var class="Ar">signer-id</var>] <var class="Ar">name</var></dt>
<dd>Manage tags in a repository.
<p class="Pp">Tags are managed via references which live in the
“refs/tags/” reference namespace. The <code class="Cm">got
existing reference or tag name which will be resolved to a commit ID.
An abbreviated hash argument will be expanded to a full SHA1 hash
automatically, provided the abbreviation is unique.</dd>
+ <dt id="l~6"><a class="permalink" href="#l~6"><code class="Fl">-l</code></a></dt>
+ <dd>List all existing tags in the repository instead of creating a new
+ tag. If a <var class="Ar">name</var> argument is passed, show only the
+ tag with the given <var class="Ar">name</var>.</dd>
<dt id="m~3"><a class="permalink" href="#m~3"><code class="Fl">-m</code></a>
<var class="Ar">message</var></dt>
<dd>Use the specified tag message when creating the new tag. Without the
repository is located at or above the current working directory. If
this directory is a <code class="Nm">got</code> work tree, use the
repository path associated with this work tree.</dd>
- <dt id="l~6"><a class="permalink" href="#l~6"><code class="Fl">-l</code></a></dt>
- <dd>List all existing tags in the repository instead of creating a new
- tag. If a <var class="Ar">name</var> argument is passed, show only the
- tag with the given <var class="Ar">name</var>.</dd>
<dt id="s~5"><a class="permalink" href="#s~5"><code class="Fl">-s</code></a>
<var class="Ar">signer-id</var></dt>
<dd>While creating a new tag, sign this tag with the identity given in
<a class="Xr" aria-label="ssh-agent, section 1">ssh-agent(1)</a>.
<code class="Cm">got tag</code> will sign the tag object by invoking
<a class="Xr" aria-label="ssh-keygen, section 1">ssh-keygen(1)</a>
- with the <code class="Fl">-Y</code> <var class="Ar">sign</var>
+ with the <code class="Fl">-Y</code> <code class="Cm">sign</code>
command, using the signature namespace “git” for
compatibility with <a class="Xr" aria-label="git, section
1">git(1)</a>.</p>
</dd>
- <dt id="v~3"><a class="permalink" href="#v~3"><code class="Fl">-v</code></a></dt>
- <dd>Verbose mode. During SSH signature creation and verification this
- option will be passed to <a class="Xr" aria-label="ssh-keygen, section
- 1">ssh-keygen(1)</a>. Multiple -v options increase the verbosity. The
- maximum is 3.</dd>
<dt id="V~2"><a class="permalink" href="#V~2"><code class="Fl">-V</code></a></dt>
<dd>Verify tag object signatures. If a <var class="Ar">name</var> is
specified, show and verify the tag object with the provided name.
<p class="Pp"><code class="Cm">got tag</code> verifies SSH-based
signatures by invoking <a class="Xr" aria-label="ssh-keygen, section
1">ssh-keygen(1)</a> with the options <code class="Fl">-Y</code>
- <var class="Ar">verify</var> <code class="Fl">-f</code>
+ <code class="Cm">verify</code> <code class="Fl">-f</code>
<var class="Ar">allowed_signers</var>. A path to the
<var class="Ar">allowed_signers</var> file must be set in
<a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a>,
otherwise verification is impossible.</p>
</dd>
+ <dt id="v~3"><a class="permalink" href="#v~3"><code class="Fl">-v</code></a></dt>
+ <dd>Verbose mode. During SSH signature creation and verification this
+ option will be passed to <a class="Xr" aria-label="ssh-keygen, section
+ 1">ssh-keygen(1)</a>. Multiple -v options increase the verbosity. The
+ maximum is 3.</dd>
</dl>
<p class="Pp">By design, the <code class="Cm">got tag</code> command will
not delete tags or change existing tags. If a tag must be deleted, the
copied to another repository.</p>
</dd>
<dt id="add"><a class="permalink" href="#add"><code class="Cm">add</code></a>
- [<code class="Fl">-R</code>] [<code class="Fl">-I</code>]
- <var class="Ar">path ...</var></dt>
+ [<code class="Fl">-IR</code>] <var class="Ar">path ...</var></dt>
<dd>Schedule unversioned files in a work tree for addition to the repository
in the next commit. By default, files which match a <code class="Cm">got
status</code> ignore pattern will not be added.
<p class="Pp">The options for <code class="Cm">got add</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="I~3"><a class="permalink" href="#I~3"><code class="Fl">-I</code></a></dt>
+ <dd>Add files even if they match a <code class="Cm">got status</code>
+ ignore pattern.</dd>
<dt id="R~5"><a class="permalink" href="#R~5"><code class="Fl">-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>
- <dt id="I~3"><a class="permalink" href="#I~3"><code class="Fl">-I</code></a></dt>
- <dd>Add files even if they match a <code class="Cm">got status</code>
- ignore pattern.</dd>
</dl>
</dd>
<dt id="rm"><a class="permalink" href="#remove"><code class="Cm" id="remove">remove</code></a>
- [<code class="Fl">-f</code>] [<code class="Fl">-k</code>]
- [<code class="Fl">-R</code>] [<code class="Fl">-s</code>
+ [<code class="Fl">-fkR</code>] [<code class="Fl">-s</code>
<var class="Ar">status-codes</var>] <var class="Ar">path ...</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
</dl>
</dd>
<dt id="pa"><a class="permalink" href="#patch"><code class="Cm" id="patch">patch</code></a>
- [<code class="Fl">-n</code>] [<code class="Fl">-p</code>
- <var class="Ar">strip-count</var>] [<code class="Fl">-R</code>]
- [<var class="Ar">patchfile</var>]</dt>
+ [<code class="Fl">-nR</code>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-p</code>
+ <var class="Ar">strip-count</var>] [<var class="Ar">patchfile</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">pa</code>)</code></div>
<p class="Pp">The options for <code class="Cm">got patch</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="c~10"><a class="permalink" href="#c~10"><code class="Fl">-c</code></a>
+ <var class="Ar">commit</var></dt>
+ <dd>Attempt to locate files within the specified
+ <var class="Ar">commit</var> for use as a merge-base for 3-way merges.
+ Ideally, the specified <var class="Ar">commit</var> should contain
+ versions of files which the changes contained in the
+ <var class="Ar">patchfile</var> were based on. Files will be located
+ by path, relative to the repository root. If the
+ <code class="Fl">-p</code> option is used then leading path components
+ will be stripped before paths are looked up in the repository.
+ <p class="Pp">If the <code class="Fl">-c</code> option is not used then
+ <code class="Cm">got patch</code> will attempt to locate merge-bases
+ via object IDs found in <var class="Ar">patchfile</var> meta-data,
+ such as produced by <code class="Cm">got diff</code> or
+ <a class="Xr" aria-label="git-diff, section 1">git-diff(1)</a>. Use
+ of the <code class="Fl">-c</code> option is only recommended in the
+ absence of such meta-data.</p>
+ <p class="Pp">In case no merge-base is available for a file, changes
+ will be applied without doing a 3-way merge. Changes which do not
+ apply cleanly may then be rejected entirely, rather than producing
+ merge conflicts in the patched target file.</p>
+ </dd>
<dt id="n~2"><a class="permalink" href="#n~2"><code class="Fl">-n</code></a></dt>
<dd>Do not make any modifications to the work tree. This can be used to
check whether a patch would apply without issues. If the
</dl>
</dd>
<dt id="rv"><a class="permalink" href="#revert"><code class="Cm" id="revert">revert</code></a>
- [<code class="Fl">-p</code>] [<code class="Fl">-F</code>
- <var class="Ar">response-script</var>] [<code class="Fl">-R</code>]
- <var class="Ar">path ...</var></dt>
+ [<code class="Fl">-pR</code>] [<code class="Fl">-F</code>
+ <var class="Ar">response-script</var>] <var class="Ar">path ...</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">rv</code>)</code></div>
<p class="Pp">The options for <code class="Cm">got revert</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="F"><a class="permalink" href="#F"><code class="Fl">-F</code></a>
+ <var class="Ar">response-script</var></dt>
+ <dd>With the <code class="Fl">-p</code> option, read “y”,
+ “n”, and “q” responses line-by-line from
+ the specified <var class="Ar">response-script</var> file instead of
+ prompting interactively.</dd>
<dt id="p~4"><a class="permalink" href="#p~4"><code class="Fl">-p</code></a></dt>
<dd>Instead of reverting all changes in files, interactively select or
reject changes to revert based on “y” (revert change),
patches derived from the modified file content can be reverted. Files
in added or deleted status may only be reverted in their
entirety.</dd>
- <dt id="F"><a class="permalink" href="#F"><code class="Fl">-F</code></a>
- <var class="Ar">response-script</var></dt>
- <dd>With the <code class="Fl">-p</code> option, read “y”,
- “n”, and “q” responses line-by-line from
- the specified <var class="Ar">response-script</var> file instead of
- prompting interactively.</dd>
<dt id="R~8"><a class="permalink" href="#R~8"><code class="Fl">-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
</dl>
</dd>
<dt id="ci"><a class="permalink" href="#commit"><code class="Cm" id="commit">commit</code></a>
- [<code class="Fl">-F</code> <var class="Ar">path</var>]
- [<code class="Fl">-m</code> <var class="Ar">message</var>]
- [<code class="Fl">-N</code>] [<code class="Fl">-S</code>]
- [<var class="Ar">path ...</var>]</dt>
+ [<code class="Fl">-NS</code>] [<code class="Fl">-A</code>
+ <var class="Ar">author</var>] [<code class="Fl">-F</code>
+ <var class="Ar">path</var>] [<code class="Fl">-m</code>
+ <var class="Ar">message</var>] [<var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">ci</code>)</code></div>
<p class="Pp">The options for <code class="Cm">got commit</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="A"><a class="permalink" href="#A"><code class="Fl">-A</code></a>
+ <var class="Ar">author</var></dt>
+ <dd>Set author information in the newly created commit to
+ <var class="Ar">author</var>. This is useful when committing changes
+ which were written by someone else. The <var class="Ar">author</var>
+ argument must use the same format as the
+ <code class="Ev">GOT_AUTHOR</code> environment variable.
+ <p class="Pp">In addition to storing author information, the newly
+ created commit object will retain “committer”
+ information which is obtained, as usual, from the
+ <code class="Ev">GOT_AUTHOR</code> environment variable, or
+ <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a>, or
+ Git configuration settings.</p>
+ </dd>
<dt id="F~2"><a class="permalink" href="#F~2"><code class="Fl">-F</code></a>
<var class="Ar">path</var></dt>
<dd>Use the prepared log message stored in the file found at
local changes with changes made in the repository.</p>
</dd>
<dt id="se"><a class="permalink" href="#send"><code class="Cm" id="send">send</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-b</code>
+ [<code class="Fl">-afqTv</code>] [<code class="Fl">-b</code>
<var class="Ar">branch</var>] [<code class="Fl">-d</code>
- <var class="Ar">branch</var>] [<code class="Fl">-f</code>]
- [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
- [<code class="Fl">-t</code> <var class="Ar">tag</var>]
- [<code class="Fl">-T</code>] [<code class="Fl">-q</code>]
- [<code class="Fl">-v</code>] [<var class="Ar">remote-repository</var>]</dt>
+ <var class="Ar">branch</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<code class="Fl">-t</code>
+ <var class="Ar">tag</var>] [<var class="Ar">remote-repository</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">se</code>)</code></div>
risks of creating inconsistencies between different repositories
should also be taken into account.</p>
</dd>
+ <dt id="q~5"><a class="permalink" href="#q~5"><code class="Fl">-q</code></a></dt>
+ <dd>Suppress progress reporting output. The same option will be passed to
+ <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> if
+ applicable.</dd>
<dt id="r~10"><a class="permalink" href="#r~10"><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 <code class="Nm">got</code> work tree, use the
repository path associated with this work tree.</dd>
+ <dt id="T"><a class="permalink" href="#T"><code class="Fl">-T</code></a></dt>
+ <dd>Attempt to send all tags from the local repository's
+ “refs/tags/” reference namespace. The
+ <code class="Fl">-T</code> option is equivalent to listing all tags
+ with multiple <code class="Fl">-t</code> options. Cannot be used
+ together with the <code class="Fl">-t</code> option.</dd>
<dt id="t~4"><a class="permalink" href="#t~4"><code class="Fl">-t</code></a>
<var class="Ar">tag</var></dt>
<dd>Send the specified <var class="Ar">tag</var> from the local
<p class="Pp">Cannot be used together with the
<code class="Fl">-T</code> option.</p>
</dd>
- <dt id="T"><a class="permalink" href="#T"><code class="Fl">-T</code></a></dt>
- <dd>Attempt to send all tags from the local repository's
- “refs/tags/” reference namespace. The
- <code class="Fl">-T</code> option is equivalent to listing all tags
- with multiple <code class="Fl">-t</code> options. Cannot be used
- together with the <code class="Fl">-t</code> option.</dd>
- <dt id="q~5"><a class="permalink" href="#q~5"><code class="Fl">-q</code></a></dt>
- <dd>Suppress progress reporting output. The same option will be passed to
- <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> if
- applicable.</dd>
<dt id="v~4"><a class="permalink" href="#v~4"><code class="Fl">-v</code></a></dt>
<dd>Verbose mode. Causes <code class="Cm">got send</code> to print
debugging messages to standard error output. The same option will be
contain merge conflicts, these conflicts must be resolved first.</p>
</dd>
<dt id="rb"><a class="permalink" href="#rebase"><code class="Cm" id="rebase">rebase</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
- [<code class="Fl">-l</code>] [<code class="Fl">-X</code>]
- [<var class="Ar">branch</var>]</dt>
+ [<code class="Fl">-aclX</code>] [<var class="Ar">branch</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">rb</code>)</code></div>
<var class="Ar">branch</var>, but with different commit IDs. Once
rebasing has completed successfully, the temporary branch becomes the
new version of the specified <var class="Ar">branch</var> and the work
- tree is automatically switched to it.</p>
+ tree is automatically switched to it. If author information is available
+ via the <code class="Ev">GOT_AUTHOR</code> environment variable,
+ <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a> or Git's
+ <code class="Dv">user.name</code> and <code class="Dv">user.email</code>
+ configuration settings, this author information will be used to identify
+ the “committer” of rebased commits.</p>
<p class="Pp">Old commits in their pre-rebase state are automatically backed
up in the “refs/got/backup/rebase” reference namespace. As
long as these references are not removed older versions of rebased
merged change into a no-op change, the corresponding commit will be
elided when the rebase operation continues.</p>
<p class="Pp"><code class="Cm">got rebase</code> will refuse to run if
- certain preconditions are not met. If the work tree is not yet fully
- updated to the tip commit of its branch, then the work tree must first
- be updated with <code class="Cm">got update</code>. If changes have been
- staged with <code class="Cm">got stage</code>, these changes must first
- be committed with <code class="Cm">got commit</code> or unstaged with
+ certain preconditions are not met. If the <var class="Ar">branch</var>
+ is not in the “refs/heads/” reference namespace, the
+ branch may not be rebased. If the work tree is not yet fully updated to
+ the tip commit of its branch, then the work tree must first be updated
+ with <code class="Cm">got update</code>. If changes have been staged
+ with <code class="Cm">got stage</code>, these changes must first be
+ committed with <code class="Cm">got commit</code> or unstaged with
<code class="Cm">got unstage</code>. If the work tree contains local
changes, these changes must first be committed with <code class="Cm">got
commit</code> or reverted with <code class="Cm">got revert</code>. If
<dt id="a~5"><a class="permalink" href="#a~5"><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~10"><a class="permalink" href="#c~10"><code class="Fl">-c</code></a></dt>
+ <dt id="c~11"><a class="permalink" href="#c~11"><code class="Fl">-c</code></a></dt>
<dd>Continue an interrupted rebase operation. If this option is used, no
other command-line arguments are allowed.</dd>
<dt id="l~7"><a class="permalink" href="#l~7"><code class="Fl">-l</code></a></dt>
</dl>
</dd>
<dt id="he"><a class="permalink" href="#histedit"><code class="Cm" id="histedit">histedit</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
- [<code class="Fl">-e</code>] [<code class="Fl">-f</code>]
- [<code class="Fl">-F</code> <var class="Ar">histedit-script</var>]
- [<code class="Fl">-m</code>] [<code class="Fl">-l</code>]
- [<code class="Fl">-X</code>] [<var class="Ar">branch</var>]</dt>
+ [<code class="Fl">-aceflmX</code>] [<code class="Fl">-F</code>
+ <var class="Ar">histedit-script</var>] [<var class="Ar">branch</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">he</code>)</code></div>
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">The <code class="Cm">got histedit</code> command requires the
+ <code class="Ev">GOT_AUTHOR</code> environment variable to be set,
+ unless an author has been configured in
+ <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a> or Git's
+ <code class="Dv">user.name</code> and <code class="Dv">user.email</code>
+ configuration settings can be obtained from the repository's
+ <span class="Pa">.git/config</span> file or from Git's global
+ <span class="Pa">~/.gitconfig</span> configuration file.</p>
<p class="Pp">Before starting a <code class="Cm">histedit</code> operation,
the work tree's current branch must be set with <code class="Cm">got
update -b</code> to the branch which should be edited, unless this
<dt id="a~6"><a class="permalink" href="#a~6"><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~11"><a class="permalink" href="#c~11"><code class="Fl">-c</code></a></dt>
+ <dt id="c~12"><a class="permalink" href="#c~12"><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="e"><a class="permalink" href="#e"><code class="Fl">-e</code></a></dt>
<code class="Fl">-e</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~3"><a class="permalink" href="#f~3"><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~3"><a class="permalink" href="#F~3"><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
opening a temporary file in an editor where a histedit script can be
written.</dd>
- <dt id="m~5"><a class="permalink" href="#m~5"><code class="Fl">-m</code></a></dt>
- <dd>Edit log messages only. This option is a quick equivalent to a
- histedit script which edits only log messages but otherwise leaves
- every picked commit as-is. The <code class="Fl">-m</code> option can
+ <dt id="f~3"><a class="permalink" href="#f~3"><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="l~8"><a class="permalink" href="#l~8"><code class="Fl">-l</code></a></dt>
histedit</code> does not require a work tree. None of the other
options can be used together with <code class="Fl">-l</code>.</p>
</dd>
+ <dt id="m~5"><a class="permalink" href="#m~5"><code class="Fl">-m</code></a></dt>
+ <dd>Edit log messages only. This option is a quick equivalent to a
+ histedit script which edits only log messages but otherwise leaves
+ every picked commit as-is. The <code class="Fl">-m</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="X~3"><a class="permalink" href="#X~3"><code class="Fl">-X</code></a></dt>
<dd>Delete backups created by past histedit operations, represented by
references in the “refs/got/backup/histedit” reference
reverted with <code class="Cm">got revert</code>.</p>
</dd>
<dt id="mg"><a class="permalink" href="#merge"><code class="Cm" id="merge">merge</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
- [<code class="Fl">-n</code>] [<var class="Ar">branch</var>]</dt>
+ [<code class="Fl">-acn</code>] [<var class="Ar">branch</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">mg</code>)</code></div>
<dt id="a~7"><a class="permalink" href="#a~7"><code class="Fl">-a</code></a></dt>
<dd>Abort an interrupted merge operation. If this option is used, no other
command-line arguments are allowed.</dd>
- <dt id="c~12"><a class="permalink" href="#c~12"><code class="Fl">-c</code></a></dt>
+ <dt id="c~13"><a class="permalink" href="#c~13"><code class="Fl">-c</code></a></dt>
<dd>Continue an interrupted merge operation. If this option is used, no
other command-line arguments are allowed.</dd>
<dt id="n~3"><a class="permalink" href="#n~3"><code class="Fl">-n</code></a></dt>
</dl>
</dd>
<dt id="sg"><a class="permalink" href="#stage"><code class="Cm" id="stage">stage</code></a>
- [<code class="Fl">-l</code>] [<code class="Fl">-p</code>]
- [<code class="Fl">-F</code> <var class="Ar">response-script</var>]
- [<code class="Fl">-S</code>] [<var class="Ar">path ...</var>]</dt>
+ [<code class="Fl">-lpS</code>] [<code class="Fl">-F</code>
+ <var class="Ar">response-script</var>] [<var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">sg</code>)</code></div>
<p class="Pp">The options for <code class="Cm">got stage</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="F~4"><a class="permalink" href="#F~4"><code class="Fl">-F</code></a>
+ <var class="Ar">response-script</var></dt>
+ <dd>With the <code class="Fl">-p</code> option, read “y”,
+ “n”, and “q” responses line-by-line from
+ the specified <var class="Ar">response-script</var> file instead of
+ prompting interactively.</dd>
<dt id="l~9"><a class="permalink" href="#l~9"><code class="Fl">-l</code></a></dt>
<dd>Instead of staging new changes, list paths which are already staged,
along with the IDs of staged blob objects and stage status codes. If
individual patches derived from the modified file content can be
staged. Files in added or deleted status may only be staged or
rejected in their entirety.</dd>
- <dt id="F~4"><a class="permalink" href="#F~4"><code class="Fl">-F</code></a>
- <var class="Ar">response-script</var></dt>
- <dd>With the <code class="Fl">-p</code> option, read “y”,
- “n”, and “q” responses line-by-line from
- the specified <var class="Ar">response-script</var> file instead of
- prompting interactively.</dd>
<dt id="S~4"><a class="permalink" href="#S~4"><code class="Fl">-S</code></a></dt>
<dd>Allow staging of symbolic links which point outside of the path space
that is under version control. By default, <code class="Cm">got
<p class="Pp">The options for <code class="Cm">got unstage</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="F~5"><a class="permalink" href="#F~5"><code class="Fl">-F</code></a>
+ <var class="Ar">response-script</var></dt>
+ <dd>With the <code class="Fl">-p</code> option, read “y”,
+ “n”, and “q” responses line-by-line from
+ the specified <var class="Ar">response-script</var> file instead of
+ prompting interactively.</dd>
<dt id="p~6"><a class="permalink" href="#p~6"><code class="Fl">-p</code></a></dt>
<dd>Instead of unstaging the entire content of a changed file,
interactively select or reject changes for unstaging based on
If a file is staged in modified status, individual patches derived
from the staged file content can be unstaged. Files staged in added or
deleted status may only be unstaged in their entirety.</dd>
- <dt id="F~5"><a class="permalink" href="#F~5"><code class="Fl">-F</code></a>
- <var class="Ar">response-script</var></dt>
- <dd>With the <code class="Fl">-p</code> option, read “y”,
- “n”, and “q” responses line-by-line from
- the specified <var class="Ar">response-script</var> file instead of
- prompting interactively.</dd>
</dl>
</dd>
<dt id="cat"><a class="permalink" href="#cat"><code class="Cm">cat</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">-P</code>] <var class="Ar">arg ...</var></dt>
+ [<code class="Fl">-P</code>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] <var class="Ar">arg ...</var></dt>
<dd>Parse and print contents of objects to standard output in a line-based
text format. Content of commit, tree, and tag objects is printed in a way
similar to the actual content stored in such objects. Blob object contents
<p class="Pp">The options for <code class="Cm">got cat</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~13"><a class="permalink" href="#c~13"><code class="Fl">-c</code></a>
+ <dt id="c~14"><a class="permalink" href="#c~14"><code class="Fl">-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
hash or an existing reference or tag name which will be resolved to a
commit ID. An abbreviated hash argument will be expanded to a full
SHA1 hash automatically, provided the abbreviation is unique.</dd>
+ <dt id="P~3"><a class="permalink" href="#P~3"><code class="Fl">-P</code></a></dt>
+ <dd>Interpret all arguments as paths only. This option can be used to
+ resolve ambiguity in cases where paths look like tag names, reference
+ names, or object IDs.</dd>
<dt id="r~11"><a class="permalink" href="#r~11"><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 <code class="Nm">got</code> work tree, use the
repository path associated with this work tree.</dd>
- <dt id="P~3"><a class="permalink" href="#P~3"><code class="Fl">-P</code></a></dt>
- <dd>Interpret all arguments as paths only. This option can be used to
- resolve ambiguity in cases where paths look like tag names, reference
- names, or object IDs.</dd>
</dl>
</dd>
<dt id="info"><a class="permalink" href="#info"><code class="Cm">info</code></a>
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="ENVIRONMENT"><a class="permalink" href="#ENVIRONMENT">ENVIRONMENT</a></h1>
+<h2 class="Sh" id="ENVIRONMENT"><a class="permalink" href="#ENVIRONMENT">ENVIRONMENT</a></h2>
<dl class="Bl-tag">
<dt id="GOT_AUTHOR"><a class="permalink" href="#GOT_AUTHOR"><code class="Ev">GOT_AUTHOR</code></a></dt>
- <dd>The author's name and email address for <code class="Cm">got commit</code>
- and <code class="Cm">got import</code>, for example:
- “<span class="An">Flan Hacker</span>
+ <dd>The author's name and email address, such as “<span class="An">Flan
+ Hacker</span>
<<a class="Mt" href="mailto:flan_hacker@openbsd.org">flan_hacker@openbsd.org</a>>”.
- Because <a class="Xr" aria-label="git, section 1">git(1)</a> may fail to
- parse commits without an email address in author data,
+ Used by the <code class="Cm">got commit</code>, <code class="Cm">got
+ import</code>, <code class="Cm">got rebase</code>, and
+ <code class="Cm">got histedit</code> commands. Because
+ <a class="Xr" aria-label="git, section 1">git(1)</a> may fail to parse
+ commits without an email address in author data,
<code class="Nm">got</code> attempts to reject
<code class="Ev">GOT_AUTHOR</code> environment variables with a missing
email address.
<code class="Cm">got log</code>. If set to zero, the limit is unbounded.
This variable will be silently ignored if it is set to a non-numeric
value.</dd>
+ <dt id="GOT_IGNORE_GITCONFIG"><a class="permalink" href="#GOT_IGNORE_GITCONFIG"><code class="Ev">GOT_IGNORE_GITCONFIG</code></a></dt>
+ <dd>If this variable is set then any remote repository definitions or author
+ information found in Git configuration files will be ignored.</dd>
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h1>
+<h2 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h2>
<dl class="Bl-tag Bl-compact">
<dt><span class="Pa">got.conf</span></dt>
<dd>Repository-wide configuration settings for <code class="Nm">got</code>. If
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
- STATUS</a></h1>
+<h2 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
+ STATUS</a></h2>
<p class="Pp">The <code class="Nm">got</code> utility exits 0 on success,
and >0 if an error occurs.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
+<h2 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h2>
<p class="Pp">Enable tab-completion of <code class="Nm">got</code> command names
in <a class="Xr" aria-label="ksh, section 1">ksh(1)</a>:</p>
<p class="Pp"></p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ cd /var/git/src.git</code></div>
<div class="Bd Bd-indent"><code class="Li">$ git push origin master</code></div>
+<p class="Pp">When making contributions to projects which use the “pull
+ request” workflow, SSH protocol repository access needs to be set up
+ first. Once an account has been created on a Git hosting site it should be
+ possible to upload a public SSH key for repository access
+ authentication.</p>
+<p class="Pp">The “pull request” workflow will usually involve two
+ remote repositories. In the real-life example below, the
+ “origin” repository was forked from the
+ “upstream” repository by using the Git hosting site's web
+ interface. The <a class="Xr" aria-label="got.conf, section
+ 5">got.conf(5)</a> file in the local repository describes both remote
+ repositories:</p>
+<div class="Bd Pp Bd-indent Li">
+<pre># Jelmers's repository, which accepts pull requests
+remote "upstream" {
+ server git@github.com
+ protocol ssh
+ repository "/jelmer/dulwich"
+ branch { "master" }
+}
+
+# Stefan's fork, used as the default remote repository
+remote "origin" {
+ server git@github.com
+ protocol ssh
+ repository "/stspdotname/dulwich"
+ branch { "master" }
+}</pre>
+</div>
+<p class="Pp">With this configuration, Stefan can create commits on
+ “refs/heads/master” and send them to the
+ “origin” repository by running:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got send -b master
+ origin</code></div>
+<p class="Pp">The changes can now be proposed to Jelmer by opening a pull
+ request via the Git hosting site's web interface. If Jelmer requests further
+ changes to be made, additional commits can be created on the
+ “master” branch and be added to the pull request by running
+ <code class="Cd">got send</code> again.</p>
+<p class="Pp">If Jelmer prefers additional commits to be
+ “squashed” then the following commands can be used to achieve
+ this:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got update -b master</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got update -c
+ origin/master</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got histedit -f</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got send -f -b master
+ origin</code></div>
+<p class="Pp">Once Jelmer has accepted the pull request, Stefan can fetch the
+ merged changes, and possibly several other new changes, by running:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got fetch upstream</code></div>
+<p class="Pp">The merged changes will now be visible under the reference
+ “refs/remotes/upstream/master”. The local
+ “master” branch can now be rebased on top of the latest
+ changes from upstream:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got update -b
+ upstream/master</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got rebase master</code></div>
+<p class="Pp">As a final step, the forked repository's copy of the master branch
+ needs to be kept in sync by sending the new changes there:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got send -f -b master
+ origin</code></div>
+<p class="Pp">If multiple pull requests need to be managed in parallel, a
+ separate branch must be created for each pull request with
+ <code class="Cm">got branch</code>. Each such branch can then be used as
+ above, in place of “refs/heads/master”. Changes for any
+ accepted pull requests will still appear under
+ “refs/remotes/upstream/master,” regardless of which branch was
+ used in the forked repository to create a pull request.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
- ALSO</a></h1>
+<h2 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
+ ALSO</a></h2>
<p class="Pp"><a class="Xr" aria-label="gotadmin, section 1">gotadmin(1)</a>,
<a class="Xr" aria-label="tog, section 1">tog(1)</a>,
<a class="Xr" aria-label="git-repository, section 5">git-repository(5)</a>,
<a class="Xr" aria-label="gotweb, section 8">gotweb(8)</a></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h1>
+<h2 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h2>
<p class="Pp"><span class="An">Anthony J. Bentley</span>
<<a class="Mt" href="mailto:bentley@openbsd.org">bentley@openbsd.org</a>>
<br/>
code under copyright by:</p>
<p class="Pp">
<br/>
- <span class="An">Caldera International Inc.</span>
+ <span class="An">Caldera International</span>
<br/>
<span class="An">Daniel Hartmeier</span>
<br/>
<span class="An">Austin Appleby</span></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h1>
+<h2 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h2>
<p class="Pp"><code class="Nm">got</code> is a work-in-progress and some
features remain to be implemented.</p>
<p class="Pp">At present, the user has to fall back on
usually produce better results.</li>
</ul>
</section>
-</div>
-<table class="foot">
- <tr>
- <td class="foot-date">July 14, 2022</td>
- <td class="foot-os">OpenBSD 7.1</td>
- </tr>
-</table>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
</body>
</html>
blob - b02502269266bd342d90d94ed629d0b2c1f2f063
blob + 727f28bf52d0747b8c3739866167e5c30b5f852b
--- got.conf.5.html
+++ got.conf.5.html
<!DOCTYPE html>
<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>GOT.CONF(5)</title>
+</head>
<!-- This is an automatically generated file. Do not edit.
Copyright (c) 2020 Stefan Sperling <stsp@openbsd.org>
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
- <title>GOT.CONF(5)</title>
-</head>
<body>
-<table class="head">
- <tr>
- <td class="head-ltitle">GOT.CONF(5)</td>
- <td class="head-vol">File Formats Manual</td>
- <td class="head-rtitle">GOT.CONF(5)</td>
- </tr>
-</table>
-<div class="manual-text">
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">GOT.CONF(5)</span> <span class="head-vol">File
+ Formats Manual</span> <span class="head-rtitle">GOT.CONF(5)</span></div>
+<main class="manual-text">
<section class="Sh">
-<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<p class="Pp"><code class="Nm">got.conf</code> — <span class="Nd">Game of
- Trees configuration file</span></p>
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
+<p class="Pp"><code class="Nm">got.conf</code> —
+ <span class="Nd" role="doc-subtitle">Game of Trees configuration
+ file</span></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
<p class="Pp"><code class="Nm">got.conf</code> is the run-time configuration
file for <a class="Xr" aria-label="got, section 1">got(1)</a>.</p>
<p class="Pp"><code class="Nm">got.conf</code> may be present in the root
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
+<h2 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h2>
<p class="Pp">Configure author information:</p>
<div class="Bd Pp Bd-indent Li">
<pre>author "Flan Hacker <flan_hacker@openbsd.org>"</pre>
</div>
</section>
<section class="Sh">
-<h1 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h1>
+<h2 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h2>
<dl class="Bl-tag Bl-compact">
<dt><span class="Pa">got.conf</span></dt>
<dd>If present, <code class="Nm">got.conf</code> located in the root directory
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
- ALSO</a></h1>
+<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>,
<a class="Xr" aria-label="git-repository, section 5">git-repository(5)</a>,
<a class="Xr" aria-label="got-worktree, section 5">got-worktree(5)</a></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h1>
+<h2 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h2>
<p class="Pp"><code class="Nm">got.conf</code> offers no way to configure the
editor spawned by <code class="Cm">got commit</code>, <code class="Cm">got
histedit</code>, <code class="Cm">got import</code>, or <code class="Cm">got
users. Users should set their <code class="Ev">VISUAL</code> or
<code class="Ev">EDITOR</code> environment variables instead.</p>
</section>
-</div>
-<table class="foot">
- <tr>
- <td class="foot-date">July 14, 2022</td>
- <td class="foot-os">OpenBSD 7.1</td>
- </tr>
-</table>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
</body>
</html>
blob - 38061b789ea565df7f11bb3a0d7b0ba4556b510a
blob + 7a9098625780fda11673b8230946c37ceac4c68d
--- gotadmin.1.html
+++ gotadmin.1.html
<!DOCTYPE html>
<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>GOTADMIN(1)</title>
+</head>
<!-- This is an automatically generated file. Do not edit.
Copyright (c) 2021 Stefan Sperling
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
- <title>GOTADMIN(1)</title>
-</head>
<body>
-<table class="head">
- <tr>
- <td class="head-ltitle">GOTADMIN(1)</td>
- <td class="head-vol">General Commands Manual</td>
- <td class="head-rtitle">GOTADMIN(1)</td>
- </tr>
-</table>
-<div class="manual-text">
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">GOTADMIN(1)</span>
+ <span class="head-vol">General Commands Manual</span>
+ <span class="head-rtitle">GOTADMIN(1)</span></div>
+<main class="manual-text">
<section class="Sh">
-<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<p class="Pp"><code class="Nm">gotadmin</code> — <span class="Nd">Game of
- Trees repository administration</span></p>
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
+<p class="Pp"><code class="Nm">gotadmin</code> —
+ <span class="Nd" role="doc-subtitle">Game of Trees repository
+ administration</span></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h1>
+<h2 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h2>
<table class="Nm">
<tr>
<td><code class="Nm">gotadmin</code></td>
</table>
</section>
<section class="Sh">
-<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
<p class="Pp"><code class="Nm">gotadmin</code> is the repository maintenance
tool for the <a class="Xr" aria-label="got, section 1">got(1)</a> version
control system.</p>
</dl>
</dd>
<dt id="pack"><a class="permalink" href="#pack"><code class="Cm">pack</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-r</code>
+ [<code class="Fl">-aq</code>] [<code class="Fl">-r</code>
<var class="Ar">repository-path</var>] [<code class="Fl">-x</code>
- <var class="Ar">reference</var>] [<code class="Fl">-q</code>]
- [<var class="Ar">reference ...</var>]</dt>
+ <var class="Ar">reference</var>] [<var class="Ar">reference ...</var>]</dt>
<dd>Generate a new pack file and a corresponding pack file index. By default,
add any loose objects which are reachable via any references to the
generated pack file.
<dd>Add objects to the generated pack file even if they are already packed
in a different pack file. Unless this option is specified, only loose
objects will be added.</dd>
+ <dt id="q"><a class="permalink" href="#q"><code class="Fl">-q</code></a></dt>
+ <dd>Suppress progress reporting output.</dd>
<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
appears in both the included and excluded lists, it will be
excluded.</p>
</dd>
- <dt id="q"><a class="permalink" href="#q"><code class="Fl">-q</code></a></dt>
- <dd>Suppress progress reporting output.</dd>
</dl>
</dd>
<dt id="ix"><a class="permalink" href="#indexpack"><code class="Cm" id="indexpack">indexpack</code></a>
ends in <span class="Pa">.idx</span>.</p>
</dd>
<dt id="ls"><a class="permalink" href="#listpack"><code class="Cm" id="listpack">listpack</code></a>
- [<code class="Fl">-h</code>] [<code class="Fl">-s</code>]
- <var class="Ar">packfile-path</var></dt>
+ [<code class="Fl">-hs</code>] <var class="Ar">packfile-path</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">ls</code>)</code></div>
</dl>
</dd>
<dt id="cl"><a class="permalink" href="#cleanup"><code class="Cm" id="cleanup">cleanup</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-p</code>]
- [<code class="Fl">-n</code>] [<code class="Fl">-r</code>
- <var class="Ar">repository-path</var>] [<code class="Fl">-q</code>]</dt>
+ [<code class="Fl">-anpq</code>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">cl</code>)</code></div>
prevent race conditions with other commands that add new objects to
the repository while <code class="Cm">gotadmin cleanup</code> is
running.</dd>
- <dt id="p"><a class="permalink" href="#p"><code class="Fl">-p</code></a></dt>
- <dd>Instead of purging unreferenced loose objects, remove any pack index
- files which do not have a corresponding pack file.</dd>
<dt id="n"><a class="permalink" href="#n"><code class="Fl">-n</code></a></dt>
<dd>Display the usual progress output and summary information but do not
actually remove any files from disk.</dd>
+ <dt id="p"><a class="permalink" href="#p"><code class="Fl">-p</code></a></dt>
+ <dd>Instead of purging unreferenced loose objects, remove any pack index
+ files which do not have a corresponding pack file.</dd>
+ <dt id="q~2"><a class="permalink" href="#q~2"><code class="Fl">-q</code></a></dt>
+ <dd>Suppress progress reporting and disk space summary output.</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
this directory is a <a class="Xr" aria-label="got, section
1">got(1)</a> work tree, use the repository path associated with this
work tree.</dd>
- <dt id="q~2"><a class="permalink" href="#q~2"><code class="Fl">-q</code></a></dt>
- <dd>Suppress progress reporting and disk space summary output.</dd>
</dl>
</dd>
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
- STATUS</a></h1>
+<h2 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
+ STATUS</a></h2>
<p class="Pp">The <code class="Nm">gotadmin</code> utility exits 0 on
success, and >0 if an error occurs.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
- ALSO</a></h1>
+<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>,
<a class="Xr" aria-label="tog, section 1">tog(1)</a>,
<a class="Xr" aria-label="git-repository, section 5">git-repository(5)</a>,
<a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h1>
+<h2 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h2>
<p class="Pp"><span class="An">Christian Weisgerber</span>
<<a class="Mt" href="mailto:naddy@openbsd.org">naddy@openbsd.org</a>>
<br/>
<<a class="Mt" href="mailto:tracey@traceyemery.net">tracey@traceyemery.net</a>></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h1>
+<h2 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h2>
<p class="Pp"><code class="Nm">gotadmin</code> is a work-in-progress and some
features remain to be implemented.</p>
<p class="Pp">At present, the user has to fall back on
</ul>
</section>
<section class="Sh">
-<h1 class="Sh" id="BUGS"><a class="permalink" href="#BUGS">BUGS</a></h1>
+<h2 class="Sh" id="BUGS"><a class="permalink" href="#BUGS">BUGS</a></h2>
<p class="Pp">Disk space savings reported by <code class="Cm">gotadmin
cleanup</code> will be misleading if the repository contains object files
that were hard-linked from another repository. Such hard-links will be
commands. By itself, <a class="Xr" aria-label="got, section 1">got(1)</a>
will never create hard-linked object files.</p>
</section>
-</div>
-<table class="foot">
- <tr>
- <td class="foot-date">July 14, 2022</td>
- <td class="foot-os">OpenBSD 7.1</td>
- </tr>
-</table>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
</body>
</html>
blob - f4d494324343ec006be3e28a28938d472990e7ff
blob + eddcb60ecccf272587ca9f63b3b31c7991edf1da
--- gotweb.8.html
+++ gotweb.8.html
<!DOCTYPE html>
<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>GOTWEB(8)</title>
+</head>
<!-- This is an automatically generated file. Do not edit.
Copyright (c) 2020 Stefan Sperling
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
- <title>GOTWEB(8)</title>
-</head>
<body>
-<table class="head">
- <tr>
- <td class="head-ltitle">GOTWEB(8)</td>
- <td class="head-vol">System Manager's Manual</td>
- <td class="head-rtitle">GOTWEB(8)</td>
- </tr>
-</table>
-<div class="manual-text">
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">GOTWEB(8)</span> <span class="head-vol">System
+ Manager's Manual</span> <span class="head-rtitle">GOTWEB(8)</span></div>
+<main class="manual-text">
<section class="Sh">
-<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<p class="Pp"><code class="Nm">gotweb</code> — <span class="Nd">Game of
- Trees Git repository server for web browsers</span></p>
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
+<p class="Pp"><code class="Nm">gotweb</code> —
+ <span class="Nd" role="doc-subtitle">Game of Trees Git repository server for
+ web browsers</span></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h1>
+<h2 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h2>
<table class="Nm">
<tr>
<td><code class="Nm">gotweb</code></td>
</table>
</section>
<section class="Sh">
-<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
<p class="Pp"><code class="Nm">gotweb</code> provides a web interface allowing
Git repository contents to be viewed with a web browser.</p>
<p class="Pp"><code class="Nm">gotweb</code> is a CGI program based on
</ol>
</section>
<section class="Sh">
-<h1 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h1>
+<h2 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h2>
<dl class="Bl-tag Bl-compact">
<dt><span class="Pa">/var/www/got/public/</span></dt>
<dd>Default location for Git repositories served by
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
+<h2 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h2>
<p class="Pp">Example configuration for httpd.conf:</p>
<div class="Bd Pp Bd-indent Li">
<pre>
</div>
</section>
<section class="Sh">
-<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
- ALSO</a></h1>
+<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>,
<a class="Xr" aria-label="kcgi, section 3">kcgi(3)</a>,
<a class="Xr" aria-label="git-repository, section 5">git-repository(5)</a>,
<a class="Xr" aria-label="slowcgi, section 8">slowcgi(8)</a></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h1>
+<h2 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h2>
<p class="Pp"><span class="An">Christian Weisgerber</span>
<<a class="Mt" href="mailto:naddy@openbsd.org">naddy@openbsd.org</a>>
<br/>
<span class="An">Tracey Emery</span>
<<a class="Mt" href="mailto:tracey@traceyemery.net">tracey@traceyemery.net</a>></p>
</section>
-</div>
-<table class="foot">
- <tr>
- <td class="foot-date">July 14, 2022</td>
- <td class="foot-os">OpenBSD 7.1</td>
- </tr>
-</table>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
</body>
</html>
blob - d889515e2af00857e523a67b847195a5d15cfed8
blob + 72506c6f4c5c769126cd7de604529e684b0e22fc
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
<!DOCTYPE html>
<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>GOTWEB.CONF(5)</title>
+</head>
<!-- This is an automatically generated file. Do not edit.
Copyright (c) 2020 Tracey Emery <tracey@traceyemery.net>
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
- <title>GOTWEB.CONF(5)</title>
-</head>
<body>
-<table class="head">
- <tr>
- <td class="head-ltitle">GOTWEB.CONF(5)</td>
- <td class="head-vol">File Formats Manual</td>
- <td class="head-rtitle">GOTWEB.CONF(5)</td>
- </tr>
-</table>
-<div class="manual-text">
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">GOTWEB.CONF(5)</span>
+ <span class="head-vol">File Formats Manual</span>
+ <span class="head-rtitle">GOTWEB.CONF(5)</span></div>
+<main class="manual-text">
<section class="Sh">
-<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
<p class="Pp"><code class="Nm">gotweb.conf</code> —
- <span class="Nd">gotweb configuration file</span></p>
+ <span class="Nd" role="doc-subtitle">gotweb configuration file</span></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
<p class="Pp"><code class="Nm">gotweb.conf</code> is the run-time configuration
file for <a class="Xr" aria-label="gotweb, section 8">gotweb(8)</a>.</p>
<p class="Pp">The file format is line-based, with one configuration directive
<a class="Xr" aria-label="httpd, section 8">httpd(8)</a>.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="GLOBAL_CONFIGURATION"><a class="permalink" href="#GLOBAL_CONFIGURATION">GLOBAL
- CONFIGURATION</a></h1>
+<h2 class="Sh" id="GLOBAL_CONFIGURATION"><a class="permalink" href="#GLOBAL_CONFIGURATION">GLOBAL
+ CONFIGURATION</a></h2>
<p class="Pp">The available configuration directives are as follows:</p>
<dl class="Bl-tag">
<dt id="got_max_commits_display"><a class="permalink" href="#got_max_commits_display"><code class="Ic">got_max_commits_display</code></a>
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
+<h2 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h2>
<p class="Pp">These are the currently configurable items for
<a class="Xr" aria-label="gotweb, section 8">gotweb(8)</a> with their
default values.</p>
</div>
</section>
<section class="Sh">
-<h1 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h1>
+<h2 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h2>
<dl class="Bl-tag Bl-compact">
<dt><span class="Pa">/var/www/etc/gotweb.conf</span></dt>
<dd>Location of the <code class="Nm">gotweb.conf</code> configuration
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
- ALSO</a></h1>
+<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>,
<a class="Xr" aria-label="gotweb, section 8">gotweb(8)</a></p>
</section>
-</div>
-<table class="foot">
- <tr>
- <td class="foot-date">July 14, 2022</td>
- <td class="foot-os">OpenBSD 7.1</td>
- </tr>
-</table>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
</body>
</html>
blob - /dev/null
blob + 9cefe6e7779507fef4b3ff0692ed274ede7d67a1 (mode 644)
--- /dev/null
+++ gotwebd.8.html
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>GOTWEBD(8)</title>
+</head>
+<!-- This is an automatically generated file. Do not edit.
+ Copyright (c) 2020 Stefan Sperling
+
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ -->
+<body>
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">GOTWEBD(8)</span>
+ <span class="head-vol">System Manager's Manual</span>
+ <span class="head-rtitle">GOTWEBD(8)</span></div>
+<main class="manual-text">
+<section class="Sh">
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
+<p class="Pp"><code class="Nm">gotwebd</code> —
+ <span class="Nd" role="doc-subtitle">Game of Trees Git Fast-CGI repository
+ server for web browsers</span></p>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h2>
+<table class="Nm">
+ <tr>
+ <td><code class="Nm">gotwebd</code></td>
+ <td></td>
+ </tr>
+</table>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
+<p class="Pp"><code class="Nm">gotwebd</code> is a Fast-CGI server program which
+ can display the contents of Git repositories via a web browser. The program
+ has been designed to work out of the box with the
+ <a class="Xr" aria-label="httpd, section 8">httpd(8)</a> web server.</p>
+<p class="Pp">Enabling <code class="Nm">gotwebd</code> requires the following
+ steps:</p>
+<ol class="Bl-enum">
+ <li>The <a class="Xr" aria-label="httpd.conf, section 5">httpd.conf(5)</a>
+ configuration file must be adjusted to run <code class="Nm">gotwebd</code>
+ as a Fast-CGI helper program. The
+ <a class="Sx" href="#EXAMPLES">EXAMPLES</a> section below contains an
+ appropriate configuration file sample.</li>
+ <li>httpd(8) must be enabled and started:
+ <div class="Bd Pp Bd-indent Li">
+ <pre> # rcctl enable httpd
+ # rcctl start httpd</pre>
+ </div>
+ </li>
+ <li>Optionally, the run-time behaviour of <code class="Nm">gotwebd</code> can
+ be configured via the <a class="Xr" aria-label="gotwebd.conf, section
+ 5">gotwebd.conf(5)</a> configuration file.</li>
+ <li id="not">Git repositories must be created at a suitable location inside
+ the web server's <a class="Xr" aria-label="chroot, section
+ 2">chroot(2)</a> environment. These repositories should
+ <a class="permalink" href="#not"><i class="Em">not</i></a> be writable by
+ the user ID shared between <code class="Nm">gotwebd</code> and
+ <a class="Xr" aria-label="httpd, section 8">httpd(8)</a>. The default
+ location for repositories published by <code class="Nm">gotwebd</code> is
+ <span class="Pa">/var/www/got/public</span>.</li>
+ <li>Git repositories served by <code class="Nm">gotwebd</code> should be kept
+ up-to-date with a mechanism such as <code class="Cm">got fetch</code>,
+ <a class="Xr" aria-label="git-fetch, section 1">git-fetch(1)</a>, or
+ <a class="Xr" aria-label="rsync, section 1">rsync(1)</a>, scheduled by
+ <a class="Xr" aria-label="cron, section 8">cron(8)</a>.</li>
+</ol>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h2>
+<dl class="Bl-tag Bl-compact">
+ <dt><span class="Pa">/var/www/got/public/</span></dt>
+ <dd>Default location for Git repositories served by
+ <code class="Nm">gotwebd</code>. This location can be adjusted in the
+ <a class="Xr" aria-label="gotwebd.conf, section 5">gotwebd.conf(5)</a>
+ configuration file.</dd>
+ <dt><span class="Pa">/var/www/bin/gotwebd/</span></dt>
+ <dd>Directory containing statically linked <a class="Xr" aria-label="got,
+ section 1">got(1)</a> helper programs which are run by
+ <code class="Nm">gotwebd</code> to read Git repositories.</dd>
+ <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">/tmp/</span></dt>
+ <dd>Directory for temporary files created by
+ <code class="Nm">gotwebd</code>.</dd>
+</dl>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h2>
+<p class="Pp">Example configuration for httpd.conf:</p>
+<div class="Bd Pp Bd-indent Li">
+<pre> types { include "/usr/share/misc/mime.types" }
+
+ # one gotwebd reachable at http://gotweb1.example.com/
+ server "gotweb1.example.com" {
+ listen on * port 80
+ root "/htdocs/gotwebd"
+ location "/" {
+ fastcgi socket tcp localhost 9000
+ }
+ }
+
+ # hosting multiple gotwebd instances on the same HTTP server:
+ # http://gotweb2.example.com/gotwebd-unix/
+ # http://gotweb2.example.com/gotwebd-tcp/
+ server "gotweb2.example.com" {
+ listen on * port 80
+ location "/gotwebd-unix/" {
+ fastcgi socket "/run/gotweb.sock"
+ }
+ location "/gotwebd-unix/*" {
+ root "/htdocs/gotwebd"
+ request strip 1
+ }
+ location "/gotwebd-tcp/" {
+ fastcgi socket tcp 127.0.0.1 9000
+ }
+ location "/gotwebd-tcp/*" {
+ root "/htdocs/gotwebd"
+ request strip 1
+ }
+ }</pre>
+</div>
+</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>,
+ <a class="Xr" aria-label="git-repository, section 5">git-repository(5)</a>,
+ <a class="Xr" aria-label="gotwebd.conf, section 5">gotwebd.conf(5)</a>,
+ <a class="Xr" aria-label="httpd, section 8">httpd(8)</a></p>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h2>
+<p class="Pp"><span class="An">Omar Polo</span>
+ <<a class="Mt" href="mailto:op@openbsd.org">op@openbsd.org</a>>
+ <br/>
+ <span class="An">Stefan Sperling</span>
+ <<a class="Mt" href="mailto:stsp@openbsd.org">stsp@openbsd.org</a>>
+ <br/>
+ <span class="An">Tracey Emery</span>
+ <<a class="Mt" href="mailto:tracey@traceyemery.net">tracey@traceyemery.net</a>></p>
+</section>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
+</body>
+</html>
blob - /dev/null
blob + 49020bc65c1067a3145c83bfc9eff9cb379fc8dc (mode 644)
--- /dev/null
+++ gotwebd.conf.5.html
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>GOTWEBD.CONF(5)</title>
+</head>
+<!-- This is an automatically generated file. Do not edit.
+ Copyright (c) 2020 Tracey Emery <tracey@traceyemery.net>
+
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ -->
+<body>
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">GOTWEBD.CONF(5)</span>
+ <span class="head-vol">File Formats Manual</span>
+ <span class="head-rtitle">GOTWEBD.CONF(5)</span></div>
+<main class="manual-text">
+<section class="Sh">
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
+<p class="Pp"><code class="Nm">gotwebd.conf</code> —
+ <span class="Nd" role="doc-subtitle">gotwebd configuration file</span></p>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
+<p class="Pp"><code class="Nm">gotwebd.conf</code> is the run-time configuration
+ file for <a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a>.</p>
+<p class="Pp">The file format is line-based, with one configuration directive
+ per line. Any lines beginning with a ‘#’ are treated as
+ comments and ignored.</p>
+<p class="Pp">Paths mentioned in <code class="Nm">gotwebd.conf</code> must be
+ relative to <span class="Pa">/var/www</span>, 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>.</p>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="GLOBAL_CONFIGURATION"><a class="permalink" href="#GLOBAL_CONFIGURATION">GLOBAL
+ CONFIGURATION</a></h2>
+<p class="Pp">The available global configuration directives are as follows:</p>
+<dl class="Bl-tag">
+ <dt id="chroot"><a class="permalink" href="#chroot"><code class="Ic">chroot</code></a>
+ <var class="Ar">path</var></dt>
+ <dd>Set the path to the 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>
+ <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.</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.</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.</dd>
+</dl>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="SERVER_CONFIGURATION"><a class="permalink" href="#SERVER_CONFIGURATION">SERVER
+ CONFIGURATION</a></h2>
+<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>
+<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>
+<p class="Pp"><code class="Ic">server</code> <var class="Ar">name</var>
+ {...}</p>
+<p class="Pp"><a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a> is
+ compatible with TLS Server Name Indication (SNI), provided the
+ <var class="Ar">name</var> of a server defined in
+ <code class="Nm">gotwebd.conf</code> corresponds to the name of a server
+ defined in <a class="Xr" aria-label="httpd.conf, section
+ 5">httpd.conf(5)</a>.</p>
+<p class="Pp">The available server configuration directives are as follows:</p>
+<dl class="Bl-tag">
+ <dt id="custom_css"><a class="permalink" href="#custom_css"><code class="Ic">custom_css</code></a>
+ <var class="Ar">path</var></dt>
+ <dd>Set the path to a custom Cascading Style Sheet (CSS) to be used. If this
+ option is not specified then a default style sheet 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 FCGI TCP connections. Valid
+ <var class="Ar">address</var> arguments are hostnames, IP4 addresses, IPv6
+ addresses, and network interface names. 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="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.</dd>
+ <dt id="logo_url"><a class="permalink" href="#logo_url"><code class="Ic">logo_url</code></a>
+ <var class="Ar">url</var></dt>
+ <dd>Set a hyperlink for the logo.</dd>
+ <dt id="max_commits_display"><a class="permalink" href="#max_commits_display"><code class="Ic">max_commits_display</code></a>
+ <var class="Ar">number</var></dt>
+ <dd>Set the maximum amount of commits displayed per page.</dd>
+ <dt id="max_repos"><a class="permalink" href="#max_repos"><code class="Ic">max_repos</code></a>
+ <var class="Ar">number</var></dt>
+ <dd>Set the maximum amount of repositories <a class="Xr" aria-label="gotwebd,
+ section 8">gotwebd(8)</a> will work with.</dd>
+ <dt id="max_repos_display"><a class="permalink" href="#max_repos_display"><code class="Ic">max_repos_display</code></a>
+ <var class="Ar">number</var></dt>
+ <dd>Set the maximum amount of repositories displayed on the index screen.</dd>
+ <dt id="repos_path"><a class="permalink" href="#repos_path"><code class="Ic">repos_path</code></a>
+ <var class="Ar">path</var></dt>
+ <dd>Set the path to the directory which contains Git repositories that the
+ server should publish.</dd>
+ <dt id="show_repo_age"><a class="permalink" href="#show_repo_age"><code class="Ic">show_repo_age</code></a>
+ <var class="Ar">on</var> | <var class="Ar">off</var></dt>
+ <dd>Toggle display of last repository modification date.</dd>
+ <dt id="show_repo_cloneurl"><a class="permalink" href="#show_repo_cloneurl"><code class="Ic">show_repo_cloneurl</code></a>
+ <var class="Ar">on</var> | <var class="Ar">off</var></dt>
+ <dd>Toggle display of clone URLs for a repository. This requires the creation
+ of a <span class="Pa">cloneurl</span> file inside the repository which
+ contains one URL per line.</dd>
+ <dt id="show_repo_description"><a class="permalink" href="#show_repo_description"><code class="Ic">show_repo_description</code></a>
+ <var class="Ar">on</var> | <var class="Ar">off</var></dt>
+ <dd>Toggle display of the repository description. The
+ <span class="Pa">description</span> file in the repository should be
+ updated with an appropriate description.</dd>
+ <dt id="show_repo_owner"><a class="permalink" href="#show_repo_owner"><code class="Ic">show_repo_owner</code></a>
+ <var class="Ar">on</var> | <var class="Ar">off</var></dt>
+ <dd>Set whether to display the repository owner. Displaying the owner requires
+ owner information to be added to the <span class="Pa">config</span> file
+ in the repository. <a class="Xr" aria-label="gotwebd, section
+ 8">gotwebd(8)</a> will parse owner information from either a [gotweb] or a
+ [gitweb] section. For example:
+ <div class="Bd Pp Bd-indent Li">
+ <pre>[gotweb]
+owner = "Your Name"</pre>
+ </div>
+ </dd>
+ <dt id="site_link"><a class="permalink" href="#site_link"><code class="Ic">site_link</code></a>
+ <var class="Ar">string</var></dt>
+ <dd>Set the displayed site link name for the index page.</dd>
+ <dt id="site_name"><a class="permalink" href="#site_name"><code class="Ic">site_name</code></a>
+ <var class="Ar">string</var></dt>
+ <dd>Set the displayed site name title.</dd>
+ <dt id="site_owner"><a class="permalink" href="#site_owner"><code class="Ic">site_owner</code></a>
+ <var class="Ar">string</var></dt>
+ <dd>Set the displayed site owner.</dd>
+ <dt id="show_site_owner"><a class="permalink" href="#show_site_owner"><code class="Ic">show_site_owner</code></a>
+ <var class="Ar">on</var> | <var class="Ar">off</var></dt>
+ <dd>Toggle display of the site owner.</dd>
+ <dt id="unix_socket~2"><a class="permalink" href="#unix_socket~2"><code class="Ic">unix_socket</code></a>
+ <var class="Ar">on</var> | <var class="Ar">off</var></dt>
+ <dd>Enable or disable use of unix sockets.</dd>
+ <dt id="unix_socket_name~2"><a class="permalink" href="#unix_socket_name~2"><code class="Ic">unix_socket_name</code></a>
+ <var class="Ar">path</var></dt>
+ <dd>Set the path to the unix socket used by the server.</dd>
+</dl>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h2>
+<p class="Pp">These are the currently configurable items for
+ <a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a> with their
+ default values.</p>
+<div class="Bd Pp Bd-indent Li">
+<pre>#
+# gotwebd options
+# all paths relative to /var/www (httpd chroot jail)
+#
+
+prefork 1
+
+server "localhost-unix" {
+ repos_path "/got/public"
+ unix_socket_name "/run/gotweb.sock"
+
+ got_site_name "my public repos"
+ got_site_owner "Got Owner"
+ got_site_link "repos"
+
+ logo "got.png"
+ logo_url "https://gameoftrees.org"
+
+ # on by default
+ #show_site_owner off
+ #show_repo_owner off
+ #show_repo_age false
+ #show_repo_description no
+ #show_repo_cloneurl off
+
+ #max_repos 100
+ #max_repos_display 25
+ #max_commits_display 50
+}
+
+# Example server context for FCGI over TCP connections:
+#server "localhost-tcp" {
+# repos_path "/got/public"
+# unix_socket off
+# listen on 127.0.0.1 port 9000
+# listen on ::1 port 9000
+#}</pre>
+</div>
+</section>
+<section class="Sh">
+<h2 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h2>
+<dl class="Bl-tag Bl-compact">
+ <dt><span class="Pa">/var/www/etc/gotweb.conf</span></dt>
+ <dd>Location of the <code class="Nm">gotwebd.conf</code> configuration
+ file.</dd>
+</dl>
+</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>,
+ <a class="Xr" aria-label="httpd.conf, section 5">httpd.conf(5)</a>,
+ <a class="Xr" aria-label="services, section 5">services(5)</a>,
+ <a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a>,
+ <a class="Xr" aria-label="httpd, section 8">httpd(8)</a></p>
+</section>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
+</body>
+</html>
blob - c4f64310ce9769efffc0e169f8e61f07c1abe383
blob + 32c7e93cb3250e884ca4b8c8543069ea825fba2a
--- sync-man.sh
+++ sync-man.sh
for f in gotweb.8 gotweb.conf.5; do
$CONVERT $HOME/src/got/gotweb/$f > ./${f}.html
done
+for f in gotwebd.8 gotwebd.conf.5; do
+ $CONVERT $HOME/src/got/gotwebd/$f > ./${f}.html
+done
+
got st
blob - 8d96cac194d2dacbbb37d0c6b90ee050a203ed3f
blob + 9f20805def69b9cf49642caad3a3384ae76ab3c4
--- tog.1.html
+++ tog.1.html
<!DOCTYPE html>
<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
+ <title>TOG(1)</title>
+</head>
<!-- This is an automatically generated file. Do not edit.
Copyright (c) 2018 Stefan Sperling
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <link rel="stylesheet" href="mandoc.css" type="text/css" media="all"/>
- <title>TOG(1)</title>
-</head>
<body>
-<table class="head">
- <tr>
- <td class="head-ltitle">TOG(1)</td>
- <td class="head-vol">General Commands Manual</td>
- <td class="head-rtitle">TOG(1)</td>
- </tr>
-</table>
-<div class="manual-text">
+<div class="head" role="doc-pageheader" aria-label="Manual header
+ line"><span class="head-ltitle">TOG(1)</span> <span class="head-vol">General
+ Commands Manual</span> <span class="head-rtitle">TOG(1)</span></div>
+<main class="manual-text">
<section class="Sh">
-<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<p class="Pp"><code class="Nm">tog</code> — <span class="Nd">Git
- repository browser</span></p>
+<h2 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h2>
+<p class="Pp"><code class="Nm">tog</code> —
+ <span class="Nd" role="doc-subtitle">Git repository browser</span></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h1>
+<h2 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h2>
<table class="Nm">
<tr>
<td><code class="Nm">tog</code></td>
</table>
</section>
<section class="Sh">
-<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
+<h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
<p class="Pp"><code class="Nm">tog</code> is an interactive read-only browser
for Git repositories. This repository format is described in
<a class="Xr" aria-label="git-repository, section
<dt id="+"><a class="permalink" href="#+"><code class="Cm">+</code></a></dt>
<dd>When in a split-screen view, increase the size of the focussed split N
increments (default: 1).</dd>
+ <dt id="G"><a class="permalink" href="#G"><code class="Cm">G</code></a></dt>
+ <dd>Go to line N in the view (default: last line).</dd>
+ <dt id="g"><a class="permalink" href="#g"><code class="Cm">g</code></a></dt>
+ <dd>Go to line N in the view (default: first line).</dd>
</dl>
<p class="Pp">Global options must precede the command name, and are as
follows:</p>
<dt id="Enter"><a class="permalink" href="#Enter"><code class="Cm">Enter</code></a></dt>
<dd>Open a <code class="Cm">diff</code> view showing file changes made in
the currently selected commit.</dd>
- <dt id="t"><a class="permalink" href="#t"><code class="Cm">t</code></a></dt>
+ <dt id="T"><a class="permalink" href="#T"><code class="Cm">T</code></a></dt>
<dd>Open a <code class="Cm">tree</code> view showing the tree for the
currently selected commit.</dd>
<dt id="Backspace"><a class="permalink" href="#Backspace"><code class="Cm">Backspace</code></a></dt>
<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>
+ <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>
+ <dt id="@"><a class="permalink" href="#@"><code class="Cm">@</code></a></dt>
+ <dd>Toggle between showing the author and the committer name.</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~2"><a class="permalink" href="#r~2"><code class="Fl">-r</code></a>
+ <dt id="r"><a class="permalink" href="#r"><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">-a</code>] [<code class="Fl">-C</code>
+ [<code class="Fl">-aw</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>
+ <var class="Ar">repository-path</var>] <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
<dt id="End,~2"><a class="permalink" href="#End,~2"><code class="Cm">End,
G</code></a></dt>
<dd>Scroll to the bottom of the view.</dd>
- <dt id="_"><a class="permalink" href="#_"><code class="Cm">[</code></a></dt>
- <dd>Reduce diff context by N lines (default: 1).</dd>
- <dt id="_~2"><a class="permalink" href="#_~2"><code class="Cm">]</code></a></dt>
+ <dt id="("><a class="permalink" href="#("><code class="Cm">(</code></a></dt>
+ <dd>Navigate to the Nth previous file in the diff (default: 1).</dd>
+ <dt id=")"><a class="permalink" href="#)"><code class="Cm">)</code></a></dt>
+ <dd>Navigate to the Nth next file in the diff (default: 1).</dd>
+ <dt id="_"><a class="permalink" href="#_"><code class="Cm">{</code></a></dt>
+ <dd>Navigate to the Nth previous hunk in the diff (default: 1).</dd>
+ <dt id="_~2"><a class="permalink" href="#_~2"><code class="Cm">}</code></a></dt>
+ <dd>Navigate to the Nth next hunk in the diff (default: 1).</dd>
+ <dt id="_~3"><a class="permalink" href="#_~3"><code class="Cm">[</code></a></dt>
+ <dd>Reduce diff context by N lines (default: 1).</dd>
+ <dt id="_~4"><a class="permalink" href="#_~4"><code class="Cm">]</code></a></dt>
<dd>Increase diff context by N lines (default: 1).</dd>
- <dt id="_,"><a class="permalink" href="#_,"><code class="Cm"><,
- Comma</code></a></dt>
+ <dt id="_,"><a class="permalink" href="#_,"><code class="Cm"><, Comma,
+ K</code></a></dt>
<dd>If the <code class="Cm">diff</code> view was opened via the
<code class="Cm">log</code> view, move to the Nth previous (younger)
commit. If the diff was opened via the <code class="Cm">blame</code>
view, move to the Nth previous line and load the corresponding commit
(default: 1).</dd>
<dt id="_,~2"><a class="permalink" href="#_,~2"><code class="Cm">>,
- Full stop</code></a></dt>
+ Full stop, J</code></a></dt>
<dd>If the <code class="Cm">diff</code> view was opened via the
<code class="Cm">log</code> view, move to the Nth next (older) commit.
If the diff was opened via the <code class="Cm">blame</code> view,
<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>
+ <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
<dt id="C~2"><a class="permalink" href="#C~2"><code class="Cm">C</code></a></dt>
<dd>Reload the <code class="Cm">blame</code> view with the previously
blamed commit.</dd>
+ <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
+ annotated line.</dd>
<dt id="/~3"><a class="permalink" href="#/~3"><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
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~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
<dd>Enter the currently selected directory, or switch to the
<code class="Cm">blame</code> view for the currently selected
file.</dd>
- <dt id="l"><a class="permalink" href="#l"><code class="Cm">l</code></a></dt>
+ <dt id="L~2"><a class="permalink" href="#L~2"><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>
+ <dt id="R~2"><a class="permalink" href="#R~2"><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
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~6"><a class="permalink" href="#r~6"><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
<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>
+ <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>
<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>
+ <dt id="r~5"><a class="permalink" href="#r~5"><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>
</section>
<section class="Sh">
-<h1 class="Sh" id="ENVIRONMENT"><a class="permalink" href="#ENVIRONMENT">ENVIRONMENT</a></h1>
+<h2 class="Sh" id="ENVIRONMENT"><a class="permalink" href="#ENVIRONMENT">ENVIRONMENT</a></h2>
<dl class="Bl-tag">
<dt id="TOG_DIFF_ALGORITHM"><a class="permalink" href="#TOG_DIFF_ALGORITHM"><code class="Ev">TOG_DIFF_ALGORITHM</code></a></dt>
<dd>Determines the default diff algorithm used by <code class="Nm">tog</code>.
</dl>
</section>
<section class="Sh">
-<h1 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
- STATUS</a></h1>
+<h2 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
+ STATUS</a></h2>
<p class="Pp">The <code class="Nm">tog</code> utility exits 0 on success,
and >0 if an error occurs.</p>
</section>
<section class="Sh">
-<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
- ALSO</a></h1>
+<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>,
<a class="Xr" aria-label="git-repository, section 5">git-repository(5)</a>,
<a class="Xr" aria-label="re_format, section 7">re_format(7)</a></p>
</section>
<section class="Sh">
-<h1 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h1>
+<h2 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h2>
<p class="Pp"><span class="An">Christian Weisgerber</span>
<<a class="Mt" href="mailto:naddy@openbsd.org">naddy@openbsd.org</a>>
<br/>
<span class="An">Klemens Nanni</span>
<<a class="Mt" href="mailto:kn@openbsd.org">kn@openbsd.org</a>></p>
</section>
-</div>
-<table class="foot">
- <tr>
- <td class="foot-date">July 14, 2022</td>
- <td class="foot-os">OpenBSD 7.1</td>
- </tr>
-</table>
+</main>
+<div class="foot" role="doc-pagefooter" aria-label="Manual footer
+ line"><span class="foot-left"></span><span class="foot-date">September 7,
+ 2022</span> <span class="foot-os">OpenBSD 7.2</span></div>
</body>
</html>
