commit - 61208e9aa588d74ac2384d05a36079d8694ddb06
commit + 376d4d523d69b4f587a937263f1d74b533d71864
blob - cdc98c72a449012a42aa596d11e8e99bf2ab1726
blob + 2b0eece7bd0858ce72e9d8d0330806e97fa1daf8
--- git-repository.5.html
+++ git-repository.5.html
header is terminated by a
<a class="permalink" href="#NUL"><b class="Sy">NUL</b></a> character, and
the remainder of the file contains object data. Loose objects files are
- compressed with <a class="Xr">deflate(3)</a>.</p>
+ compressed with <a class="Xr" aria-label="deflate, section
+ 3">deflate(3)</a>.</p>
<p class="Pp">Multiple objects can be bundled in a <i class="Em">pack file</i>
for better disk space efficiency and increased run-time performance. The
pack file format introduces two additional types of objects:</p>
<dt><span class="Pa">branches/</span></dt>
<dd>Legacy directory used by the deprecated Gogito Git interface.</dd>
<dt><span class="Pa">config</span></dt>
- <dd>Git configuration file. See <a class="Xr">git-config(1)</a>.</dd>
+ <dd>Git configuration file. See <a class="Xr" aria-label="git-config, section
+ 1">git-config(1)</a>.</dd>
<dt><span class="Pa">description</span></dt>
<dd>A human-readable description of the repository.</dd>
<dt><span class="Pa">got.conf</span></dt>
- <dd>Configuration file for <a class="Xr">got(1)</a>. See
- <a class="Xr">got.conf(5)</a>.</dd>
+ <dd>Configuration file for <a class="Xr" aria-label="got, section
+ 1">got(1)</a>. See <a class="Xr" aria-label="got.conf, section
+ 5">got.conf(5)</a>.</dd>
<dt><span class="Pa">hooks/</span></dt>
<dd>This directory contains hook scripts to run when certain events
occur.</dd>
<dt><span class="Pa">index</span></dt>
- <dd>The file index used by <a class="Xr">git(1)</a>. This file is not used by
- <a class="Xr">got(1)</a>, which uses the <a class="Xr">got-worktree(5)</a>
+ <dd>The file index used by <a class="Xr" aria-label="git, section
+ 1">git(1)</a>. This file is not used by <a class="Xr" aria-label="got,
+ section 1">got(1)</a>, which uses the
+ <a class="Xr" aria-label="got-worktree, section 5">got-worktree(5)</a>
file index instead.</dd>
<dt><span class="Pa">info</span></dt>
<dd>Various configuration items.</dd>
tree is present, the actual repository data is stored in a
<span class="Pa">.git</span> subfolder of the repository's root directory. A
Git repository without a work tree is known as a “bare”
- repository. <a class="Xr">got(1)</a> does not make use of Git's work tree
- and treats every repository as if it was bare.</p>
+ repository. <a class="Xr" aria-label="got, section 1">got(1)</a> does not
+ make use of Git's work tree and treats every repository as if it was
+ bare.</p>
</section>
<section class="Sh">
<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h1>
-<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">gotadmin(1)</a>,
- <a class="Xr">deflate(3)</a>, <a class="Xr">SHA1(3)</a>,
- <a class="Xr">got-worktree(5)</a>, <a class="Xr">got.conf(5)</a></p>
+<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="SHA1, section 3">SHA1(3)</a>,
+ <a class="Xr" aria-label="got-worktree, section 5">got-worktree(5)</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>
<h1 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h1>
<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">git(1)</a>. The same characters are disallowed by Got for
- compatibility purposes. Got additionally prevents users from creating
- reference names with a leading - (dash) character, because this is rarely
- intended and not considered useful.</p>
+ <a class="Xr" aria-label="git, section 1">git(1)</a>. The same characters
+ are disallowed by Got for compatibility purposes. Got additionally prevents
+ 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">June 18, 2022</td>
+ <td class="foot-date">July 4, 2022</td>
<td class="foot-os">OpenBSD 7.1</td>
</tr>
</table>
blob - 42331d97a207bd57dc04eab0093c69fd709fb75e
blob + 492fbb5771927f65c53de429ab203f7865a796a3
--- got-worktree.5.html
+++ got-worktree.5.html
a Git repository. The work tree's meta data is stored in the
<span class="Pa">.got</span> directory. A work tree is created with
<code class="Cm">got checkout</code> and is required to make changes to a
- Git repository with <a class="Xr">got(1)</a>.</p>
+ Git repository with <a class="Xr" aria-label="got, section
+ 1">got(1)</a>.</p>
<p class="Pp" id="base">A work tree stores the path to its Git repository, the
name of a reference to the branch which files were checked out from, and the
ID of a commit on this branch known as the
<dl class="Bl-tag">
<dt>Copy of filesystem meta-data</dt>
<dd>Timestamp, file size, and file ownership information from
- <a class="Xr">stat(2)</a>. This is only used to detect file modifications
- and is never applied back to the filesystem. File permissions are not
- tracked, except for the executable bit. When versioned files are checked
- out into the work tree, the current <a class="Xr">umask(2)</a> is
- heeded.</dd>
+ <a class="Xr" aria-label="stat, section 2">stat(2)</a>. This is only used
+ to detect file modifications and is never applied back to the filesystem.
+ File permissions are not tracked, except for the executable bit. When
+ versioned files are checked out into the work tree, the current
+ <a class="Xr" aria-label="umask, section 2">umask(2)</a> is heeded.</dd>
<dt>Blob object ID</dt>
<dd>The SHA1 hash of the blob object which corresponds to the contents of this
file in the repository. The hash is stored as binary data.</dd>
may still need to be updated to match file content stored in the base
commit.</dd>
<dt>Flags</dt>
- <dd>This field contains the length, according to <a class="Xr">strlen(3)</a>,
- of path data which follows, and the following flags:
+ <dd>This field contains the length, according to
+ <a class="Xr" aria-label="strlen, section 3">strlen(3)</a>, of path data
+ which follows, and the following flags:
<dl class="Bl-tag">
<dt>STAGE</dt>
<dd>Reflects the added, modified, or deleted staged state of a path staged
<p class="Pp">When the file index is modified, it is read into memory in its
entirety, modified in place, and written to a temporary file. This temporary
file is then moved on top of the old file index with
- <a class="Xr">rename(2)</a>. This ensures that no other processes see an
- inconsistent file index which is in the process of being written.</p>
+ <a class="Xr" aria-label="rename, section 2">rename(2)</a>. This ensures
+ that no other processes see an inconsistent file index which is in the
+ process of being written.</p>
<p class="Pp">Work tree meta data must only be modified while the work tree's
<span class="Pa">lock</span> file has been exclusively locked with
- <a class="Xr">lockf(3)</a>.</p>
+ <a class="Xr" aria-label="lockf, section 3">lockf(3)</a>.</p>
<p class="Pp">Each work tree has a universal unique identifier. When a work tree
is checked out or updated, this identifier is used to create a reference to
the current base commit in the Git repository. The presence of this
<dt><span class="Pa">format</span></dt>
<dd>Work tree format number.</dd>
<dt><span class="Pa">got.conf</span></dt>
- <dd>Configuration file for <a class="Xr">got(1)</a>. See
- <a class="Xr">got.conf(5)</a>.</dd>
+ <dd>Configuration file for <a class="Xr" aria-label="got, section
+ 1">got(1)</a>. See <a class="Xr" aria-label="got.conf, section
+ 5">got.conf(5)</a>.</dd>
<dt><span class="Pa">head-ref</span></dt>
<dd>Name of the reference to the current branch.</dd>
<dt><span class="Pa">lock</span></dt>
<section class="Sh">
<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h1>
-<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">rename(2)</a>,
- <a class="Xr">stat(2)</a>, <a class="Xr">umask(2)</a>,
- <a class="Xr">lockf(3)</a>, <a class="Xr">git-repository(5)</a>,
- <a class="Xr">got.conf(5)</a></p>
+<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="umask, section 2">umask(2)</a>,
+ <a class="Xr" aria-label="lockf, section 3">lockf(3)</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">June 18, 2022</td>
+ <td class="foot-date">July 4, 2022</td>
<td class="foot-os">OpenBSD 7.1</td>
</tr>
</table>
blob - fb0dcd1926d0c9d20b134523f68b6cf6a2c7945a
blob + 06436b9a7b4be95a3b33081c1b725b88ce6501fa
--- got.1.html
+++ got.1.html
<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
- <a class="Xr">git-repository(5)</a>.</p>
+ <a class="Xr" aria-label="git-repository, section
+ 5">git-repository(5)</a>.</p>
<p class="Pp"><code class="Nm">got</code> is a “distributed”
version control system because every copy of a repository is writeable.
Modifications made to files can be synchronized between repositories at any
stored in a <a class="permalink" href="#work"><i class="Em">work
tree</i></a> which can be placed at an arbitrary directory in the filesystem
hierarchy. The on-disk format of this work tree is described in
- <a class="Xr">got-worktree(5)</a>.</p>
+ <a class="Xr" aria-label="got-worktree, section 5">got-worktree(5)</a>.</p>
<p class="Pp"><code class="Nm">got</code> provides global and command-specific
options. Global options must precede the command name, and are as
follows:</p>
the path of each imported file to indicate progress.
<p class="Pp">The <code class="Cm">got import</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">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>
+ 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">The options for <code class="Cm">got import</code> are as
follows:</p>
<dl class="Bl-tag">
<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">glob(7)</a>.</dd>
+ <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>
<p class="Pp">The following protocol schemes are supported:</p>
<dl class="Bl-tag">
<dt>git</dt>
- <dd>The Git protocol as implemented by the <a class="Xr">git-daemon(1)</a>
+ <dd>The Git protocol as implemented by the
+ <a class="Xr" aria-label="git-daemon, section 1">git-daemon(1)</a>
server. Use of this protocol is discouraged since it supports neither
authentication nor encryption.</dd>
<dt>git+ssh</dt>
<dd>The Git protocol wrapped in an authenticated and encrypted
- <a class="Xr">ssh(1)</a> tunnel. With this protocol the hostname may
- contain an embedded username for <a class="Xr">ssh(1)</a> to use:
+ <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> tunnel. With this
+ protocol the hostname may contain an embedded username for
+ <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> to use:
<a class="Mt" href="mailto:user@hostname">user@hostname</a></dd>
<dt>ssh</dt>
<dd>Short alias for git+ssh.</dd>
pack file are stored in deltified form, all deltas will be fully
resolved in order to compute the ID of such objects. This can take some
time. More details about the pack file format are documented in
- <a class="Xr">git-repository(5)</a>.</p>
+ <a class="Xr" aria-label="git-repository, section
+ 5">git-repository(5)</a>.</p>
<p class="Pp"><code class="Cm">got clone</code> creates a remote repository
- entry in the <a class="Xr">got.conf(5)</a> and
- <span class="Pa">config</span> files of the cloned repository to store
- the <var class="Ar">repository-url</var> and any
- <var class="Ar">branch</var> or <var class="Ar">reference</var>
+ entry in the <a class="Xr" aria-label="got.conf, section
+ 5">got.conf(5)</a> and <span class="Pa">config</span> files of the
+ cloned repository to store the <var class="Ar">repository-url</var> and
+ any <var class="Ar">branch</var> or <var class="Ar">reference</var>
arguments for future use by <code class="Cm">got fetch</code> or
- <a class="Xr">git-fetch(1)</a>.</p>
+ <a class="Xr" aria-label="git-fetch, section 1">git-fetch(1)</a>.</p>
<p class="Pp">The options for <code class="Cm">got clone</code> are as
follows:</p>
<dl class="Bl-tag">
<dt id="a"><a class="permalink" href="#a"><code class="Fl">-a</code></a></dt>
<dd>Fetch all branches from the remote repository's
“refs/heads/” reference namespace and set
- <code class="Cm">fetch-all-branches</code> in the cloned repository's
- <a class="Xr">got.conf(5)</a> file for future use by
- <code class="Cm">got fetch</code>. If this option is not specified, a
- branch resolved via the remote repository's HEAD reference will be
- fetched. Cannot be used together with the <code class="Fl">-b</code>
- option.</dd>
+ <code class="Cm">fetch_all_branches</code> in the cloned repository's
+ <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a> file
+ for future use by <code class="Cm">got fetch</code>. If this option is
+ not specified, a branch resolved via the remote repository's HEAD
+ reference will be fetched. Cannot be used together with the
+ <code class="Fl">-b</code> option.</dd>
<dt id="b~2"><a class="permalink" href="#b~2"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Fetch the specified <var class="Ar">branch</var> from the remote
<dd>Create the cloned repository as a mirror of the original repository.
This is useful if the cloned repository will not be used to store
locally created commits.
- <p class="Pp">The repository's <a class="Xr">got.conf(5)</a> and
- <span class="Pa">config</span> files will be set up with the
- “mirror” option enabled, such that
- <code class="Cm">got fetch</code> or <a class="Xr">git-fetch(1)</a>
+ <p class="Pp">The repository's <a class="Xr" aria-label="got.conf,
+ section 5">got.conf(5)</a> and <span class="Pa">config</span> files
+ will be set up with the “mirror” option enabled, such
+ that <code class="Cm">got fetch</code> or
+ <a class="Xr" aria-label="git-fetch, section 1">git-fetch(1)</a>
will write incoming changes directly to branches in the
“refs/heads/” reference namespace, rather than to
branches in the “refs/remotes/” namespace. This avoids
</dd>
<dt id="q"><a class="permalink" href="#q"><code class="Fl">-q</code></a></dt>
<dd>Suppress progress reporting output. The same option will be passed to
- <a class="Xr">ssh(1)</a> if applicable.</dd>
+ <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">ssh(1)</a> if applicable. Multiple -v options
- increase the verbosity. The maximum is 3.</dd>
+ 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
Fetch new changes from a remote repository. If no
<var class="Ar">remote-repository</var> is specified,
“origin” will be used. The remote repository's URL is
- obtained from the corresponding entry in <a class="Xr">got.conf(5)</a> or
- Git's <span class="Pa">config</span> file of the local repository, as
- created by <code class="Cm">got clone</code>.
+ obtained from the corresponding entry in
+ <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a> or Git's
+ <span class="Pa">config</span> file of the local repository, as created by
+ <code class="Cm">got clone</code>.
<p class="Pp">New changes will be stored in a separate pack file downloaded
from the server. Optionally, separate pack files stored in the
- repository can be combined with <a class="Xr">git-repack(1)</a>.</p>
+ repository can be combined with <a class="Xr" aria-label="git-repack,
+ section 1">git-repack(1)</a>.</p>
<p class="Pp">By default, branch references in the
“refs/remotes/” reference namespace will be updated to
point at the newly fetched commits. The <code class="Cm">got
<dd>Fetch all branches from the remote repository's
“refs/heads/” reference namespace. This option can be
enabled by default for specific repositories in
- <a class="Xr">got.conf(5)</a>. If this option is not specified, a
- branch resolved via the remote repository's HEAD reference will be
- fetched. Cannot be used together with the <code class="Fl">-b</code>
- option.</dd>
+ <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a>. If
+ this option is not specified, a branch resolved via the remote
+ repository's HEAD reference will be fetched. Cannot be used together
+ with the <code class="Fl">-b</code> option.</dd>
<dt id="b~3"><a class="permalink" href="#b~3"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Fetch the specified <var class="Ar">branch</var> from the remote
repository 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">ssh(1)</a> if applicable.</dd>
+ <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">ssh(1)</a> if applicable. Multiple -v options
- increase the verbosity. The maximum is 3.</dd>
+ 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
<dd>Delete all references which correspond to a particular
<var class="Ar">remote-repository</var> instead of fetching new
changes. This can be useful when a remote repository is being removed
- from <a class="Xr">got.conf(5)</a>.
+ from <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a>.
<p class="Pp">With <code class="Fl">-X</code>, the
<var class="Ar">remote-repository</var> argument is mandatory and no
other options except <code class="Fl">-r</code>,
<p class="Pp">Only references are deleted. Any commit, tree, tag, and
blob objects fetched from a remote repository will generally be
stored in pack files and may be removed separately with
- <a class="Xr">git-repack(1)</a> and Git's garbage collector.</p>
+ <a class="Xr" aria-label="git-repack, section 1">git-repack(1)</a>
+ and Git's garbage collector.</p>
</dd>
</dl>
</dd>
Cannot be used together with the <code class="Fl">-s</code>
option.</dd>
</dl>
- <p class="Pp">For compatibility with <a class="Xr">cvs(1)</a> and
- <a class="Xr">git(1)</a>, <code class="Cm">got status</code> reads
- <a class="Xr">glob(7)</a> patterns from
- <span class="Pa">.cvsignore</span> and
- <span class="Pa">.gitignore</span> files in each traversed directory and
- will not display unversioned files which match these patterns. As an
- extension to <a class="Xr">glob(7)</a> matching rules,
- <code class="Cm">got status</code> supports consecutive asterisks,
- “**”, which will match an arbitrary amount of directories.
- Unlike <a class="Xr">cvs(1)</a>, <code class="Cm">got status</code> only
- supports a single ignore pattern per line. Unlike
- <a class="Xr">git(1)</a>, <code class="Cm">got status</code> does not
- support negated ignore patterns prefixed with “!”, and
- gives no special significance to the location of path component
- separators, “/”, in a pattern.</p>
+ <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>,
+ <code class="Cm">got status</code> reads <a class="Xr" aria-label="glob,
+ section 7">glob(7)</a> patterns from <span class="Pa">.cvsignore</span>
+ and <span class="Pa">.gitignore</span> files in each traversed directory
+ and will not display unversioned files which match these patterns. As an
+ extension to <a class="Xr" aria-label="glob, section 7">glob(7)</a>
+ matching rules, <code class="Cm">got status</code> supports consecutive
+ asterisks, “**”, which will match an arbitrary amount of
+ directories. Unlike <a class="Xr" aria-label="cvs, section
+ 1">cvs(1)</a>, <code class="Cm">got status</code> only supports a single
+ ignore pattern per line. Unlike <a class="Xr" aria-label="git, section
+ 1">git(1)</a>, <code class="Cm">got status</code> does not support
+ negated ignore patterns prefixed with “!”, and gives no
+ special significance to the location of path component separators,
+ “/”, 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>
patches will be matched if <code class="Fl">-p</code> is specified.
File paths changed by a commit will be matched if
<code class="Fl">-P</code> is specified. Regular expression syntax is
- documented in <a class="Xr">re_format(7)</a>.</dd>
+ 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
[<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>] <var class="Ar">name</var></dt>
+ [<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>
<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
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 this option is used, no other command-line arguments are
- allowed.</dd>
+ 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
+ <var class="Ar">signer-id</var>.
+ <p class="Pp">For SSH-based signatures, <var class="Ar">signer-id</var>
+ is the path to a file which may refer to either a private SSH key,
+ or a public SSH key with the private half available via
+ <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>
+ 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.
+ Otherwise, list all tag objects and verify signatures where present.
+ <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>
+ <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>
</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
<dd>Permit recursion into directories. If this option is not specified,
<code class="Cm">got remove</code> will refuse to run if a specified
<var class="Ar">path</var> is a directory.</dd>
- <dt id="s~5"><a class="permalink" href="#s~5"><code class="Fl">-s</code></a>
+ <dt id="s~6"><a class="permalink" href="#s~6"><code class="Fl">-s</code></a>
<var class="Ar">status-codes</var></dt>
<dd>Only delete files with a modification status matching one of the
single-character status codes contained in the
Files added or removed by a patch will be scheduled for addition or
removal in the work tree.
<p class="Pp">The patch must be in the unified diff format as produced by
- <code class="Cm">got diff</code>, <a class="Xr">git-diff(1)</a>, or by
- <a class="Xr">diff(1)</a> and <a class="Xr">cvs(1)</a> diff when invoked
- with their <code class="Fl">-u</code> options. If no
- <var class="Ar">patchfile</var> argument is provided, read unified diff
- data from standard input instead.</p>
+ <code class="Cm">got diff</code>, <a class="Xr" aria-label="git-diff,
+ section 1">git-diff(1)</a>, or by <a class="Xr" aria-label="diff,
+ section 1">diff(1)</a> and <a class="Xr" aria-label="cvs, section
+ 1">cvs(1)</a> diff when invoked with their <code class="Fl">-u</code>
+ options. If no <var class="Ar">patchfile</var> argument is provided,
+ read unified diff data from standard input instead.</p>
<p class="Pp">If the <var class="Ar">patchfile</var> contains multiple
patches, then attempt to apply each of them in sequence.</p>
<p class="Pp">Show the status of each affected file, using the following
<td>file was modified</td>
</tr>
<tr>
+ <td>G</td>
+ <td>file was merged using a merge-base found in the repository</td>
+ </tr>
+ <tr>
+ <td>C</td>
+ <td>file was merged and conflicts occurred during merge</td>
+ </tr>
+ <tr>
<td>D</td>
<td>file was deleted</td>
</tr>
parsed from <var class="Ar">patchfile</var>. If the
<code class="Fl">-p</code> option is not used, ‘a/’ and
‘b/’ path prefixes generated by
- <a class="Xr">git-diff(1)</a> will be recognized and stripped
- automatically.</dd>
+ <a class="Xr" aria-label="git-diff, section 1">git-diff(1)</a> will be
+ recognized and stripped automatically.</dd>
<dt id="R~7"><a class="permalink" href="#R~7"><code class="Fl">-R</code></a></dt>
<dd>Reverse the patch before applying it.</dd>
</dl>
entire work tree.</p>
<p class="Pp">The <code class="Cm">got commit</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">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>
+ 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">The options for <code class="Cm">got commit</code> are as
follows:</p>
<dl class="Bl-tag">
Send new changes to a remote repository. If no
<var class="Ar">remote-repository</var> is specified,
“origin” will be used. The remote repository's URL is
- obtained from the corresponding entry in <a class="Xr">got.conf(5)</a> or
- Git's <span class="Pa">config</span> file of the local repository, as
- created by <code class="Cm">got clone</code>.
+ obtained from the corresponding entry in
+ <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a> or Git's
+ <span class="Pa">config</span> file of the local repository, as created by
+ <code class="Cm">got clone</code>.
<p class="Pp">All objects corresponding to new changes will be written to a
temporary pack file which is then uploaded to the server. Upon success,
references in the “refs/remotes/” reference namespace of
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">ssh(1)</a> if applicable.</dd>
- <dt id="v~3"><a class="permalink" href="#v~3"><code class="Fl">-v</code></a></dt>
+ <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
- passed to <a class="Xr">ssh(1)</a> if applicable. Multiple -v options
- increase the verbosity. The maximum is 3.</dd>
+ 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="cy"><a class="permalink" href="#cherrypick"><code class="Cm" id="cherrypick">cherrypick</code></a>
<dt id="info"><a class="permalink" href="#info"><code class="Cm">info</code></a>
[<var class="Ar">path ...</var>]</dt>
<dd>Display meta-data stored in a work tree. See
- <a class="Xr">got-worktree(5)</a> for details.
+ <a class="Xr" aria-label="got-worktree, section 5">got-worktree(5)</a> for
+ details.
<p class="Pp">The work tree to use is resolved implicitly by walking upwards
from the current working directory.</p>
<p class="Pp">If one or more <var class="Ar">path</var> arguments are
and <code class="Cm">got import</code>, for example:
“<span class="An">Flan Hacker</span>
<<a class="Mt" href="mailto:flan_hacker@openbsd.org">flan_hacker@openbsd.org</a>>”.
- Because <a class="Xr">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.
+ 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.
<p class="Pp"><code class="Ev">GOT_AUTHOR will be overridden by
- configuration settings in</code> <a class="Xr">got.conf(5)</a> or by
- Git's <code class="Dv">user.name</code> and
- <code class="Dv">user.email</code> configuration settings in the
+ configuration settings in</code> <a class="Xr" aria-label="got.conf,
+ section 5">got.conf(5)</a> or by Git's <code class="Dv">user.name</code>
+ and <code class="Dv">user.email</code> configuration settings in the
repository's <span class="Pa">.git/config</span> file. The
<code class="Dv">user.name</code> and <code class="Dv">user.email</code>
configuration settings contained in Git's global
<span class="Pa">~/.gitconfig</span> configuration file will only be
- used if neither <a class="Xr">got.conf(5)</a> nor the
- <code class="Ev">GOT_AUTHOR</code> environment variable provide author
- information.</p>
+ used if neither <a class="Xr" aria-label="got.conf, section
+ 5">got.conf(5)</a> nor the <code class="Ev">GOT_AUTHOR</code>
+ environment variable provide author information.</p>
</dd>
<dt id="VISUAL"><a class="permalink" href="#VISUAL"><code class="Ev">VISUAL</code></a>,
<code class="Ev">EDITOR</code></dt>
<dd>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 tag</code>. If not set, the
- <a class="Xr">ed(1)</a> text editor will be spawned in order to give
- <a class="Xr">ed(1)</a> the attention it deserves.</dd>
+ <a class="Xr" aria-label="ed, section 1">ed(1)</a> text editor will be
+ spawned in order to give <a class="Xr" aria-label="ed, section
+ 1">ed(1)</a> the attention it deserves.</dd>
<dt id="GOT_LOG_DEFAULT_LIMIT"><a class="permalink" href="#GOT_LOG_DEFAULT_LIMIT"><code class="Ev">GOT_LOG_DEFAULT_LIMIT</code></a></dt>
<dd>The default limit on the number of commits traversed by
<code class="Cm">got log</code>. If set to zero, the limit is unbounded.
<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
- present, a <a class="Xr">got.conf(5)</a> configuration file located in the
- root directory of a Git repository supersedes any relevant settings in
- Git's <span class="Pa">config</span> file.
+ present, a <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a>
+ configuration file located in the root directory of a Git repository
+ supersedes any relevant settings in Git's <span class="Pa">config</span>
+ file.
<p class="Pp"></p>
</dd>
<dt><span class="Pa">.got/got.conf</span></dt>
<dd>Worktree-specific configuration settings for <code class="Nm">got</code>.
- If present, a <a class="Xr">got.conf(5)</a> configuration file in the
- <span class="Pa">.got</span> meta-data directory of a work tree supersedes
- any relevant settings in the repository's <a class="Xr">got.conf(5)</a>
- configuration file and Git's <span class="Pa">config</span> file.</dd>
+ If present, a <a class="Xr" aria-label="got.conf, section
+ 5">got.conf(5)</a> configuration file in the <span class="Pa">.got</span>
+ meta-data directory of a work tree supersedes any relevant settings in the
+ repository's <a class="Xr" aria-label="got.conf, section
+ 5">got.conf(5)</a> configuration file and Git's
+ <span class="Pa">config</span> file.</dd>
</dl>
</section>
<section class="Sh">
<section class="Sh">
<h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
<p class="Pp">Enable tab-completion of <code class="Nm">got</code> command names
- in <a class="Xr">ksh(1)</a>:</p>
+ in <a class="Xr" aria-label="ksh, section 1">ksh(1)</a>:</p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ set -A complete_got_1 -- $(got -h
2>&1 | sed -n s/commands://p)</code></div>
<div class="Bd Bd-indent"><code class="Li">$ cd /var/git/</code></div>
<div class="Bd Bd-indent"><code class="Li">$ got clone
ssh://git@github.com/openbsd/src.git</code></div>
-<p class="Pp">Use of HTTP URLs currently requires <a class="Xr">git(1)</a>:</p>
+<p class="Pp">Use of HTTP URLs currently requires <a class="Xr" aria-label="git,
+ section 1">git(1)</a>:</p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ cd /var/git/</code></div>
<div class="Bd Bd-indent"><code class="Li">$ git clone --bare
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ got log -p -l 3</code></div>
<p class="Pp">As above, but display changes in the order in which
- <a class="Xr">patch(1)</a> could apply them in sequence:</p>
+ <a class="Xr" aria-label="patch, section 1">patch(1)</a> could apply them in
+ sequence:</p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ got log -p -l 3 -R</code></div>
<p class="Pp">In a work tree or a git repository directory, log the history of a
<div class="Bd Bd-indent"><code class="Li">$ cd /usr/src</code></div>
<div class="Bd Bd-indent"><code class="Li">$ got fetch</code></div>
<p class="Pp">In a repository created with a HTTP URL and <code class="Cm">git
- clone --bare</code> the <a class="Xr">git-fetch(1)</a> command must be used
- instead:</p>
+ clone --bare</code> the <a class="Xr" aria-label="git-fetch, section
+ 1">git-fetch(1)</a> command must be used instead:</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 fetch origin
<div class="Bd Bd-indent"><code class="Li">$ cd /var/git/repo</code></div>
<div class="Bd Bd-indent"><code class="Li">$ git config remote.origin.mirror
false</code></div>
-<p class="Pp">Alternatively, the following <a class="Xr">git-fetch(1)</a>
- configuration item can be added manually to the Git repository's
- <span class="Pa">config</span> file:</p>
+<p class="Pp">Alternatively, the following <a class="Xr" aria-label="git-fetch,
+ section 1">git-fetch(1)</a> configuration item can be added manually to the
+ Git repository's <span class="Pa">config</span> file:</p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">[remote
"origin"]</code></div>
<code class="Cm">got branch</code>. Branches in the
“refs/remotes/origin” namespace can now be updated with
incoming changes from the remote repository with <code class="Cm">got
- fetch</code> or <a class="Xr">git-fetch(1)</a> without extra command line
- arguments. Newly fetched changes can be examined with <code class="Cm">got
- log</code>.</p>
+ fetch</code> or <a class="Xr" aria-label="git-fetch, section
+ 1">git-fetch(1)</a> without extra command line arguments. Newly fetched
+ changes can be examined with <code class="Cm">got log</code>.</p>
<p class="Pp">Display changes on the remote repository's version of the
“master” branch, as of the last time <code class="Cm">got
fetch</code> was run:</p>
<div class="Bd Bd-indent"><code class="Li">$ got send -b master
origin</code></div>
<p class="Pp">If the remote repository requires the HTTPS protocol, the
- <a class="Xr">git-push(1)</a> command must be used instead:</p>
+ <a class="Xr" aria-label="git-push, section 1">git-push(1)</a> command must
+ be used instead:</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>
<section class="Sh">
<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h1>
-<p class="Pp"><a class="Xr">gotadmin(1)</a>, <a class="Xr">tog(1)</a>,
- <a class="Xr">git-repository(5)</a>, <a class="Xr">got-worktree(5)</a>,
- <a class="Xr">got.conf(5)</a></p>
+<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="got-worktree, section 5">got-worktree(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>
<h1 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h1>
<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 <a class="Xr">git(1)</a>
- to perform some tasks. In particular:</p>
+<p class="Pp">At present, the user has to fall back on
+ <a class="Xr" aria-label="git, section 1">git(1)</a> to perform some tasks.
+ In particular:</p>
<ul class="Bl-bullet">
<li>Reading from remote repositories over HTTP or HTTPS protocols requires
- <a class="Xr">git-clone(1)</a> and <a class="Xr">git-fetch(1)</a>.</li>
+ <a class="Xr" aria-label="git-clone, section 1">git-clone(1)</a> and
+ <a class="Xr" aria-label="git-fetch, section 1">git-fetch(1)</a>.</li>
<li>Writing to remote repositories over HTTP or HTTPS protocols requires
- <a class="Xr">git-push(1)</a>.</li>
+ <a class="Xr" aria-label="git-push, section 1">git-push(1)</a>.</li>
<li>The creation of merge commits with more than two parent commits requires
- <a class="Xr">git-merge(1)</a>.</li>
+ <a class="Xr" aria-label="git-merge, section 1">git-merge(1)</a>.</li>
<li>In situations where files or directories were moved around
<code class="Cm">got</code> will not automatically merge changes to new
- locations and <a class="Xr">git(1)</a> will usually produce better
- results.</li>
+ locations and <a class="Xr" aria-label="git, section 1">git(1)</a> will
+ usually produce better results.</li>
</ul>
</section>
</div>
<table class="foot">
<tr>
- <td class="foot-date">June 18, 2022</td>
+ <td class="foot-date">July 4, 2022</td>
<td class="foot-os">OpenBSD 7.1</td>
</tr>
</table>
blob - d311662c45f7485550ead82356ce77acba83a409
blob + 1a6bebdde637968f4ec6b80960da7256e891abbf
--- got.conf.5.html
+++ got.conf.5.html
<section class="Sh">
<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
<p class="Pp"><code class="Nm">got.conf</code> is the run-time configuration
- file for <a class="Xr">got(1)</a>.</p>
+ 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
directory of a Git repository for repository-wide settings, or in the
<span class="Pa">.got</span> meta-data directory of a work tree to override
- repository-wide settings for <a class="Xr">got(1)</a> commands executed
- within this work tree.</p>
+ repository-wide settings for <a class="Xr" aria-label="got, section
+ 1">got(1)</a> commands executed within this work tree.</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>
commit</code> and <code class="Cm">got import</code> when operating on
this repository. Author information specified here overrides the
<code class="Ev">GOT_AUTHOR</code> environment variable.
- <p class="Pp">Because <a class="Xr">git(1)</a> may fail to parse commits
- without an email address in author data, <a class="Xr">got(1)</a>
- attempts to reject author information with a missing email address.</p>
+ <p class="Pp">Because <a class="Xr" aria-label="git, section 1">git(1)</a>
+ may fail to parse commits without an email address in author data,
+ <a class="Xr" aria-label="got, section 1">got(1)</a> attempts to reject
+ author information with a missing email address.</p>
</dd>
+ <dt id="allowed_signers"><a class="permalink" href="#allowed_signers"><code class="Ic">allowed_signers</code></a>
+ <span class="Pa">path</span></dt>
+ <dd>Configure a <var class="Ar">path</var> to the "allowed signers"
+ file which contains a list of trusted SSH signer identities. The file will
+ be passed to <a class="Xr" aria-label="ssh-keygen, section
+ 1">ssh-keygen(1)</a> during verification of SSH-based signatures with
+ <code class="Cm">got tag</code> <code class="Fl">-V</code>. The format of
+ the "allowed signers" file is documented in the ALLOWED SIGNERS
+ section of <a class="Xr" aria-label="ssh-keygen, section
+ 1">ssh-keygen(1)</a>.
+ <p class="Pp">Verification of SSH-based signatures is impossible unless the
+ <code class="Ic">allowed_signers</code> option is set in
+ <code class="Nm">got.conf</code>.</p>
+ </dd>
+ <dt id="revoked_signers"><a class="permalink" href="#revoked_signers"><code class="Ic">revoked_signers</code></a>
+ <span class="Pa">path</span></dt>
+ <dd>Configure a <var class="Ar">path</var> to the optional "revoked
+ signers" file, which contains a list of revoked SSH signer
+ identities. This file is passed to <a class="Xr" aria-label="ssh-keygen,
+ section 1">ssh-keygen(1)</a> during signature verification with
+ <code class="Cm">got tag</code> <code class="Fl">-V</code>. Revoked
+ identities are no longer considered trustworthy and verification of
+ relevant signatures will fail.</dd>
<dt id="remote"><a class="permalink" href="#remote"><code class="Ic">remote</code></a>
<var class="Ar">name</var> {...}</dt>
<dd>Define a remote repository. The specified <var class="Ar">name</var> can
<dl class="Bl-tag">
<dt>git</dt>
<dd>The Git protocol as implemented by the
- <a class="Xr">git-daemon(1)</a> server. Use of this protocol is
- discouraged since it supports neither authentication nor
- encryption.</dd>
+ <a class="Xr" aria-label="git-daemon, section 1">git-daemon(1)</a>
+ server. Use of this protocol is discouraged since it supports
+ neither authentication nor encryption.</dd>
<dt>git+ssh</dt>
<dd>The Git protocol wrapped in an authenticated and encrypted
- <a class="Xr">ssh(1)</a> tunnel. With this protocol the hostname
- may contain an embedded username for <a class="Xr">ssh(1)</a> to
- use:
- <a class="Mt" href="mailto:user@hostname">user@hostname</a></dd>
+ <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> tunnel. With
+ this protocol the hostname may contain an embedded username for
+ <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> to use:
+ <a class="Mt" href="mailto:user@hostname">user@hostname</a></dd>
<dt>ssh</dt>
<dd>Short alias for git+ssh.</dd>
</dl>
server. The <var class="Ar">port</var> can be specified by number or
name. The port name to number mappings are found in the file
<span class="Pa">/etc/services</span>; see
- <a class="Xr">services(5)</a> for details. If not specified, the
- default port of the specified <code class="Cm">protocol</code> will be
- used.</dd>
+ <a class="Xr" aria-label="services, section 5">services(5)</a> for
+ details. If not specified, the default port of the specified
+ <code class="Cm">protocol</code> will be used.</dd>
<dt id="branch"><a class="permalink" href="#branch"><code class="Ic">branch</code></a>
{<var class="Ar">branch ...</var>}</dt>
<dd>Specify one or more branches which <code class="Cm">got fetch</code>
be overridden at the <code class="Cm">got fetch</code> and
<code class="Cm">got send</code> command lines with the
<code class="Fl">-b</code> option.</dd>
- <dt id="fetch-all-branches"><a class="permalink" href="#fetch-all-branches"><code class="Ic">fetch-all-branches</code></a>
+ <dt id="fetch_all_branches"><a class="permalink" href="#fetch_all_branches"><code class="Ic">fetch_all_branches</code></a>
<var class="Ar">yes</var> | <var class="Ar">no</var></dt>
<dd>This option controls whether <code class="Cm">got fetch</code> will
fetch all branches from the remote repository by default. If enabled,
“refs/got/” namespace. In any case, references in the
“refs/tags/” namespace will always be fetched and mapped
directly to local references in the same namespace.</dd>
- <dt id="mirror-references"><a class="permalink" href="#mirror-references"><code class="Ic">mirror-references</code></a>
+ <dt id="mirror_references"><a class="permalink" href="#mirror_references"><code class="Ic">mirror_references</code></a>
<var class="Ar">yes</var> | <var class="Ar">no</var></dt>
<dd>This option controls the behaviour of <code class="Cm">got
fetch</code> when updating references.
repository "openbsd/src"
server git@github.com
protocol git+ssh
- mirror-references yes
+ mirror_references yes
}</pre>
</div>
<p class="Pp">Fetch changes via the Git protocol and send changes via the SSH
<dt><span class="Pa">.got/got.conf</span></dt>
<dd>If present, <code class="Nm">got.conf</code> located in the
<span class="Pa">.got</span> meta-data directory of a
- <a class="Xr">got(1)</a> work tree supersedes any relevant settings in the
- repository's <code class="Nm">got.conf</code> configuration file and Git's
- <span class="Pa">config</span> file.</dd>
+ <a class="Xr" aria-label="got, section 1">got(1)</a> work tree supersedes
+ any relevant settings in the repository's <code class="Nm">got.conf</code>
+ configuration file and Git's <span class="Pa">config</span> file.</dd>
</dl>
</section>
<section class="Sh">
<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h1>
-<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">git-repository(5)</a>,
- <a class="Xr">got-worktree(5)</a></p>
+<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>
</div>
<table class="foot">
<tr>
- <td class="foot-date">June 18, 2022</td>
+ <td class="foot-date">July 4, 2022</td>
<td class="foot-os">OpenBSD 7.1</td>
</tr>
</table>
blob - bba045f2c5a26e1d1232fecf45807b7f272afdcf
blob + 605dcdfaf2bc57892fe6af5b771a955e59d24ef6
--- gotadmin.1.html
+++ gotadmin.1.html
<section class="Sh">
<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
<p class="Pp"><code class="Nm">gotadmin</code> is the repository maintenance
- tool for the <a class="Xr">got(1)</a> version control system.</p>
-<p class="Pp"><a class="Xr">got(1)</a> stores the history of tracked files in a
- Git repository, as used by the Git version control system.
- <code class="Nm">gotadmin</code> provides commands for inspecting and
- manipulating the on-disk state of Git repositories. The repository format is
- described in <a class="Xr">git-repository(5)</a>.</p>
+ tool for the <a class="Xr" aria-label="got, section 1">got(1)</a> version
+ control system.</p>
+<p class="Pp"><a class="Xr" aria-label="got, section 1">got(1)</a> stores the
+ history of tracked files in a Git repository, as used by the Git version
+ control system. <code class="Nm">gotadmin</code> provides commands for
+ inspecting and manipulating the on-disk state of Git repositories. The
+ repository format is described in <a class="Xr" aria-label="git-repository,
+ section 5">git-repository(5)</a>.</p>
<p class="Pp"><code class="Nm">gotadmin</code> provides global and
command-specific options. Global options must precede the command name, and
are as follows:</p>
<dt id="info"><a class="permalink" href="#info"><code class="Cm">info</code></a>
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]</dt>
<dd>Display information about a repository. This includes some configuration
- settings from <a class="Xr">got.conf(5)</a>, and the number of objects
- stored in the repository, in packed or loose form, as well as the current
- on-disk size of these objects.
+ settings from <a class="Xr" aria-label="got.conf, section
+ 5">got.conf(5)</a>, and the number of objects stored in the repository, in
+ packed or loose form, as well as the current on-disk size of these
+ objects.
<p class="Pp">The options for <code class="Cm">gotadmin info</code> are as
follows:</p>
<dl class="Bl-tag">
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
- this directory is a <a class="Xr">got(1)</a> work tree, use the
- repository path associated with this work tree.</dd>
+ 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>
</dl>
</dd>
<dt id="pack"><a class="permalink" href="#pack"><code class="Cm">pack</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
- this directory is a <a class="Xr">got(1)</a> work tree, use the
- repository path associated with this work tree.</dd>
+ 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="x"><a class="permalink" href="#x"><code class="Fl">-x</code></a>
<var class="Ar">reference</var></dt>
<dd>Exclude objects reachable via the specified
Create a pack index for the pack file at
<var class="Ar">packfile-path</var>.
<p class="Pp">A pack index is required for using the corresponding pack file
- with <a class="Xr">got(1)</a>. Usually, a pack index will be created by
- commands such as <code class="Cm">gotadmin pack</code> or
- <code class="Cm">got fetch</code> as part of regular operation. The
- <code class="Cm">gotadmin indexpack</code> command may be used to
- recover from a corrupt or missing index. A given pack file will always
- yield the same bit-identical index.</p>
+ with <a class="Xr" aria-label="got, section 1">got(1)</a>. Usually, a
+ pack index will be created by commands such as <code class="Cm">gotadmin
+ pack</code> or <code class="Cm">got fetch</code> as part of regular
+ operation. The <code class="Cm">gotadmin indexpack</code> command may be
+ used to recover from a corrupt or missing index. A given pack file will
+ always yield the same bit-identical index.</p>
<p class="Pp">The provided <var class="Ar">packfile-path</var> must be
located within the <span class="Pa">objects/pack/</span> directory of
the repository and should end in <span class="Pa">.pack</span>. The
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
- this directory is a <a class="Xr">got(1)</a> work tree, use the
- repository path associated with this work tree.</dd>
+ 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>
<section class="Sh">
<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h1>
-<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">tog(1)</a>,
- <a class="Xr">git-repository(5)</a>, <a class="Xr">got.conf(5)</a></p>
+<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>
<h1 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h1>
<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 <a class="Xr">git(1)</a>
- to perform some tasks. In particular:</p>
+<p class="Pp">At present, the user has to fall back on
+ <a class="Xr" aria-label="git, section 1">git(1)</a> to perform some tasks.
+ In particular:</p>
<ul class="Bl-bullet">
<li>Removing redundant or unreferenced packed objects requires
- <a class="Xr">git-gc(1)</a> and perhaps
- <a class="Xr">git-repack(1)</a>.</li>
+ <a class="Xr" aria-label="git-gc, section 1">git-gc(1)</a> and perhaps
+ <a class="Xr" aria-label="git-repack, section 1">git-repack(1)</a>.</li>
<li>Exporting data from repositories requires
- <a class="Xr">git-fast-export(1)</a>.</li>
+ <a class="Xr" aria-label="git-fast-export, section
+ 1">git-fast-export(1)</a>.</li>
<li>Importing data into repositories requires
- <a class="Xr">git-fast-import(1)</a>.</li>
+ <a class="Xr" aria-label="git-fast-import, section
+ 1">git-fast-import(1)</a>.</li>
</ul>
</section>
<section class="Sh">
<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
- created by certain <a class="Xr">git(1)</a> commands. By itself,
- <a class="Xr">got(1)</a> will never create hard-linked object files.</p>
+ created by certain <a class="Xr" aria-label="git, section 1">git(1)</a>
+ 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">June 18, 2022</td>
+ <td class="foot-date">July 4, 2022</td>
<td class="foot-os">OpenBSD 7.1</td>
</tr>
</table>
blob - e4acbb32be3e1d9ad614512d97df9e81d77a5857
blob + cf0968fd2cda0c9769a6b0cf39a6d502fcf4c317
--- gotweb.8.html
+++ gotweb.8.html
<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
- <a class="Xr">got(1)</a> and <a class="Xr">kcgi(3)</a> which is intended to
- run in a <a class="Xr">chroot(2)</a> environment in
- <span class="Pa">/var/www</span>. The program has been designed to work out
- of the box with the <a class="Xr">httpd(8)</a> web server in conjunction
- with <a class="Xr">slowcgi(8)</a>.</p>
+ <a class="Xr" aria-label="got, section 1">got(1)</a> and
+ <a class="Xr" aria-label="kcgi, section 3">kcgi(3)</a> which is intended to
+ run in a <a class="Xr" aria-label="chroot, section 2">chroot(2)</a>
+ environment in <span class="Pa">/var/www</span>. 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 in conjunction with
+ <a class="Xr" aria-label="slowcgi, section 8">slowcgi(8)</a>.</p>
<p class="Pp">Enabling <code class="Nm">gotweb</code> requires the following
steps:</p>
<ol class="Bl-enum">
- <li>The <a class="Xr">httpd.conf(5)</a> configuration file must be adjusted to
- run <code class="Nm">gotweb</code> as a CGI program with
- <a class="Xr">slowcgi(8)</a>. The
- <a class="Sx" href="#EXAMPLES">EXAMPLES</a> section below contains an
- appropriate configuration file sample.</li>
+ <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">gotweb</code>
+ as a CGI program with <a class="Xr" aria-label="slowcgi, section
+ 8">slowcgi(8)</a>. The <a class="Sx" href="#EXAMPLES">EXAMPLES</a> section
+ below contains an appropriate configuration file sample.</li>
<li>httpd(8) and slowcgi(8) must be enabled and started:
<div class="Bd Pp Bd-indent Li">
<pre> # rcctl enable httpd slowcgi
</div>
</li>
<li>Optionally, the run-time behaviour of <code class="Nm">gotweb</code> can
- be configured via the <a class="Xr">gotweb.conf(5)</a> configuration
- file.</li>
+ be configured via the <a class="Xr" aria-label="gotweb.conf, section
+ 5">gotweb.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">chroot(2)</a> environment. These
- repositories should
+ 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 of the <a class="Xr">httpd(8)</a> server. The default location
- for repositories published by <code class="Nm">gotweb</code> is
+ the user ID of the <a class="Xr" aria-label="httpd, section
+ 8">httpd(8)</a> server. The default location for repositories published by
+ <code class="Nm">gotweb</code> is
<span class="Pa">/var/www/got/public</span>.</li>
<li>Git repositories served by <code class="Nm">gotweb</code> should be kept
up-to-date with a mechanism such as <code class="Cm">got fetch</code>,
- <a class="Xr">git-fetch(1)</a>, or <a class="Xr">rsync(1)</a>, scheduled
- by <a class="Xr">cron(8)</a>.</li>
+ <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">
<dt><span class="Pa">/var/www/got/public/</span></dt>
<dd>Default location for Git repositories served by
<code class="Nm">gotweb</code>. This location can be adjusted in the
- <a class="Xr">gotweb.conf(5)</a> configuration file.</dd>
+ <a class="Xr" aria-label="gotweb.conf, section 5">gotweb.conf(5)</a>
+ configuration file.</dd>
<dt><span class="Pa">/var/www/cgi-bin/gotweb/gotweb</span></dt>
<dd>The <code class="Nm">gotweb</code> CGI program, statically linked for use
- in a <a class="Xr">chroot(2)</a> environment.</dd>
+ in a <a class="Xr" aria-label="chroot, section 2">chroot(2)</a>
+ environment.</dd>
<dt><span class="Pa">/var/www/cgi-bin/gotweb/gw_tmpl/</span></dt>
<dd>Directory for template files used by <code class="Nm">gotweb</code>.</dd>
<dt><span class="Pa">/var/www/cgi-bin/gotweb/libexec/</span></dt>
- <dd>Directory containing statically linked <a class="Xr">got(1)</a> helper
- programs which are run by <code class="Nm">gotweb</code> to read Git
- repositories.</dd>
+ <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">gotweb</code> to read Git repositories.</dd>
<dt><span class="Pa">/var/www/htdocs/gotweb/</span></dt>
<dd>Directory containing HTML, CSS, and image files used by
<code class="Nm">gotweb</code>.</dd>
<section class="Sh">
<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h1>
-<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">kcgi(3)</a>,
- <a class="Xr">git-repository(5)</a>, <a class="Xr">gotweb.conf(5)</a>,
- <a class="Xr">httpd(8)</a>, <a class="Xr">slowcgi(8)</a></p>
+<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="gotweb.conf, section 5">gotweb.conf(5)</a>,
+ <a class="Xr" aria-label="httpd, section 8">httpd(8)</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>
</div>
<table class="foot">
<tr>
- <td class="foot-date">June 18, 2022</td>
+ <td class="foot-date">July 4, 2022</td>
<td class="foot-os">OpenBSD 7.1</td>
</tr>
</table>
blob - e6fd7dcc486aa6183fb924f532ed1074d6b33f6b
blob + 9ec3332566efce459df9b42b66c67b10217fccdf
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
<section class="Sh">
<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
<p class="Pp"><code class="Nm">gotweb.conf</code> is the run-time configuration
- file for <a class="Xr">gotweb(8)</a>.</p>
+ 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
per line. Any lines beginning with a ‘#’ are treated as
comments and ignored.</p>
<p class="Pp">Paths mentioned in <code class="Nm">gotweb.conf</code> must be
relative to <span class="Pa">/var/www</span>, the
- <a class="Xr">chroot(2)</a> environment of <a class="Xr">httpd(8)</a>.</p>
+ <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">
<h1 class="Sh" id="GLOBAL_CONFIGURATION"><a class="permalink" href="#GLOBAL_CONFIGURATION">GLOBAL
<dd>Set a hyperlink for the logo.</dd>
<dt id="got_max_repos"><a class="permalink" href="#got_max_repos"><code class="Ic">got_max_repos</code></a>
<var class="Ar">number</var></dt>
- <dd>Set the maximum amount of repositories <a class="Xr">gotweb(8)</a> will
- work with.</dd>
+ <dd>Set the maximum amount of repositories <a class="Xr" aria-label="gotweb,
+ section 8">gotweb(8)</a> will work with.</dd>
<dt id="got_max_repos_display"><a class="permalink" href="#got_max_repos_display"><code class="Ic">got_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="got_repos_path"><a class="permalink" href="#got_repos_path"><code class="Ic">got_repos_path</code></a>
<var class="Ar">path</var></dt>
<dd>Set the path to the directory which contains Git repositories that
- <a class="Xr">gotweb(8)</a> should publish.</dd>
+ <a class="Xr" aria-label="gotweb, section 8">gotweb(8)</a> should
+ publish.</dd>
<dt id="got_show_repo_owner"><a class="permalink" href="#got_show_repo_owner"><code class="Ic">got_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">gotweb(8)</a> will parse owner
- information from either a [gotweb] or a [gitweb] section. For example:
+ in the repository. <a class="Xr" aria-label="gotweb, section
+ 8">gotweb(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>
<section class="Sh">
<h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
<p class="Pp">These are the currently configurable items for
- <a class="Xr">gotweb(8)</a> with their default values.</p>
+ <a class="Xr" aria-label="gotweb, section 8">gotweb(8)</a> with their
+ default values.</p>
<div class="Bd Pp Bd-indent Li">
<pre>
#
<section class="Sh">
<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h1>
-<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">gotweb(8)</a></p>
+<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">June 18, 2022</td>
+ <td class="foot-date">July 4, 2022</td>
<td class="foot-os">OpenBSD 7.1</td>
</tr>
</table>
blob - fb2fc163ebd93b6e4fc1698b81180339dfb91cac
blob + 5f552e61f99ceaacddcf18dd7282825b659e8e1d
--- tog.1.html
+++ tog.1.html
<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
<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">git-repository(5)</a>.</p>
+ <a class="Xr" aria-label="git-repository, section
+ 5">git-repository(5)</a>.</p>
<p class="Pp"><code class="Nm">tog</code> supports several types of views which
display repository data:</p>
<dl class="Bl-tag">
<dd>Displays references in the repository.</dd>
</dl>
<p class="Pp"><code class="Nm">tog</code> provides global and command-specific
- key bindings and options. The global key bindings are:</p>
+ key bindings and options. Some command-specific key bindings may be prefixed
+ with an integer, which is denoted by N in the descriptions below, and is
+ used as a modifier to the operation as indicated.
+ <code class="Nm">tog</code> will echo digits to the screen when count
+ modifiers are entered, and complete the sequence upon input of the first
+ non-numeric character. Count modifiers can be aborted by entering an
+ unmapped key. Once a compound command is executed, the operation can be
+ cancelled with <code class="Cm">C-g</code> or
+ <code class="Cm">Backspace</code>. The global key bindings are:</p>
<dl class="Bl-tag">
<dt id="Q"><a class="permalink" href="#Q"><code class="Cm">Q</code></a></dt>
<dd>Quit <code class="Nm">tog</code>.</dd>
<dd>Quit the view which is in focus.</dd>
<dt id="Tab"><a class="permalink" href="#Tab"><code class="Cm">Tab</code></a></dt>
<dd>Switch focus between views.</dd>
- <dt id="f"><a class="permalink" href="#f"><code class="Cm">f</code></a></dt>
+ <dt id="F"><a class="permalink" href="#F"><code class="Cm">F</code></a></dt>
<dd>Toggle fullscreen mode for a split-screen view.
<code class="Nm">tog</code> will automatically use split-screen views if
the size of the terminal window is sufficiently large.</dd>
<p class="Pp">This command is also executed if no explicit command is
specified.</p>
<p class="Pp">The key bindings for <code class="Cm">tog log</code> are as
- follows:</p>
+ follows (N denotes optional prefixed count modifier):</p>
<dl class="Bl-tag">
<dt id="Down-arrow,"><a class="permalink" href="#Down-arrow,"><code class="Cm">Down-arrow,
j, >, Full stop, Ctrl-n</code></a></dt>
- <dd>Move the selection cursor down.</dd>
+ <dd>Move the selection cursor down N lines (default: 1).</dd>
<dt id="Up-arrow,"><a class="permalink" href="#Up-arrow,"><code class="Cm">Up-arrow,
k, <, Comma, Ctrl-p</code></a></dt>
- <dd>Move the selection cursor up.</dd>
+ <dd>Move the selection cursor up N lines (default: 1).</dd>
<dt id="Right-arrow,"><a class="permalink" href="#Right-arrow,"><code class="Cm">Right-arrow,
l</code></a></dt>
- <dd>Scroll log message field to the right. Log message moves left on the
- screen.</dd>
+ <dd>Scroll log message field to the right N increments (default: 1).
+ <br/>
+ Log message moves left on the screen.</dd>
<dt id="Left-arrow,"><a class="permalink" href="#Left-arrow,"><code class="Cm">Left-arrow,
h</code></a></dt>
- <dd>Scroll log message field to the left. Log message moves right on the
- screen.</dd>
+ <dd>Scroll log message field to the left N increments (default: 1).
+ <br/>
+ Log message moves right on the screen.</dd>
<dt id="$"><a class="permalink" href="#$"><code class="Cm">$</code></a></dt>
<dd>Scroll log message field to the rightmost position.</dd>
<dt id="0"><a class="permalink" href="#0"><code class="Cm">0</code></a></dt>
<dd>Scroll log message field to the leftmost position.</dd>
<dt id="Page-down,"><a class="permalink" href="#Page-down,"><code class="Cm">Page-down,
- Ctrl+f</code></a></dt>
- <dd>Move the selection cursor down one page.</dd>
+ Space, Ctrl+f, f</code></a></dt>
+ <dd>Move the selection cursor down N pages (default: 1).</dd>
<dt id="Page-up,"><a class="permalink" href="#Page-up,"><code class="Cm">Page-up,
- Ctrl+b</code></a></dt>
- <dd>Move the selection cursor up one page.</dd>
+ Ctrl+b, b</code></a></dt>
+ <dd>Move the selection cursor up N pages (default: 1).</dd>
<dt id="Ctrl+d,"><a class="permalink" href="#Ctrl+d,"><code class="Cm">Ctrl+d,
d</code></a></dt>
- <dd>Move the selection cursor down one half page.</dd>
+ <dd>Move the selection cursor down N half pages (default: 1).</dd>
<dt id="Ctrl+u,"><a class="permalink" href="#Ctrl+u,"><code class="Cm">Ctrl+u,
u</code></a></dt>
- <dd>Move the selection cursor up one half page.</dd>
+ <dd>Move the selection cursor up N half pages (default: 1).</dd>
<dt id="Home,"><a class="permalink" href="#Home,"><code class="Cm">Home,
g</code></a></dt>
<dd>Move the cursor to the newest commit.</dd>
<dd>Move the cursor to the oldest commit. This will traverse all commits
on the current branch which may take a long time depending on the
number of commits in branch history. If needed, this operation can be
- cancelled with <code class="Cm">Backspace</code>.</dd>
- <dt id="Enter,"><a class="permalink" href="#Enter,"><code class="Cm">Enter,
- Space</code></a></dt>
+ cancelled with <code class="Cm">C-g</code> or
+ <code class="Cm">Backspace</code>.</dd>
+ <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>
The search pattern is an extended regular expression which is matched
against a commit's author name, committer name, log message, and
commit ID SHA1 hash. Regular expression syntax is documented in
- <a class="Xr">re_format(7)</a>.</dd>
+ <a class="Xr" aria-label="re_format, section 7">re_format(7)</a>.</dd>
<dt id="n"><a class="permalink" href="#n"><code class="Cm">n</code></a></dt>
- <dd>Find the next commit which matches the current search pattern.
- Searching continues until either a match is found or the
- <code class="Cm">Backspace</code> key is pressed.</dd>
+ <dd>Find the Nth next commit which matches the current search pattern
+ (default: 1).
+ <br/>
+ Searching continues until either a match is found or
+ <code class="Cm">C-g</code> or the <code class="Cm">Backspace</code>
+ key is pressed.</dd>
<dt id="N"><a class="permalink" href="#N"><code class="Cm">N</code></a></dt>
- <dd>Find the previous commit which matches the current search pattern.
- Searching continues until either a match is found or the
- <code class="Cm">Backspace</code> key is pressed.</dd>
+ <dd>Find the Nth previous commit which matches the current search pattern
+ (default: 1).
+ <br/>
+ Searching continues until either a match is found or
+ <code class="Cm">C-g</code> or the <code class="Cm">Backspace</code>
+ key is pressed.</dd>
<dt id="Ctrl+l"><a class="permalink" href="#Ctrl+l"><code class="Cm">Ctrl+l</code></a></dt>
<dd>Reload the <code class="Cm">log</code> view with new commits found in
the repository.</dd>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
- this directory is a <a class="Xr">got(1)</a> work tree, use the
- repository path associated with this work tree.</dd>
+ 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>
</dl>
</dd>
<dt id="diff"><a class="permalink" href="#diff"><code class="Cm">diff</code></a>
abbreviated hash argument will be expanded to a full SHA1 hash
automatically, provided the abbreviation is unique.
<p class="Pp">The key bindings for <code class="Cm">tog diff</code> are as
- follows:</p>
+ follows (N denotes optional prefixed count modifier):</p>
<dl class="Bl-tag">
<dt id="a"><a class="permalink" href="#a"><code class="Cm">a</code></a></dt>
<dd>Toggle treatment of file contents as ASCII text even if binary data
was detected.</dd>
<dt id="Down-arrow,~2"><a class="permalink" href="#Down-arrow,~2"><code class="Cm">Down-arrow,
j, Ctrl-n</code></a></dt>
- <dd>Scroll down.</dd>
+ <dd>Scroll down N lines (default: 1).</dd>
<dt id="Up-arrow,~2"><a class="permalink" href="#Up-arrow,~2"><code class="Cm">Up-arrow,
k, Ctrl-p</code></a></dt>
- <dd>Scroll up.</dd>
+ <dd>Scroll up N lines (default: 1).</dd>
<dt id="Right-arrow,~2"><a class="permalink" href="#Right-arrow,~2"><code class="Cm">Right-arrow,
l</code></a></dt>
- <dd>Scroll view to the right. Diff output moves left on the screen.</dd>
+ <dd>Scroll view to the right N increments (default: 1).
+ <br/>
+ Diff output moves left on the screen.</dd>
<dt id="Left-arrow,~2"><a class="permalink" href="#Left-arrow,~2"><code class="Cm">Left-arrow,
h</code></a></dt>
- <dd>Scroll view to the left. Diff output moves right on the screen.</dd>
+ <dd>Scroll view to the left N increments (default: 1).
+ <br/>
+ Diff output moves right on the screen.</dd>
<dt id="$~2"><a class="permalink" href="#$~2"><code class="Cm">$</code></a></dt>
<dd>Scroll view to the rightmost position.</dd>
<dt id="0~2"><a class="permalink" href="#0~2"><code class="Cm">0</code></a></dt>
<dd>Scroll view left to the start of the line.</dd>
<dt id="Page-down,~2"><a class="permalink" href="#Page-down,~2"><code class="Cm">Page-down,
- Space, Ctrl+f</code></a></dt>
- <dd>Scroll down one page.</dd>
+ Space, Ctrl+f, f</code></a></dt>
+ <dd>Scroll down N pages (default: 1).</dd>
<dt id="Page-up,~2"><a class="permalink" href="#Page-up,~2"><code class="Cm">Page-up,
- Ctrl+b</code></a></dt>
- <dd>Scroll up one page.</dd>
+ Ctrl+b, b</code></a></dt>
+ <dd>Scroll up N pages (default: 1).</dd>
<dt id="Ctrl+d,~2"><a class="permalink" href="#Ctrl+d,~2"><code class="Cm">Ctrl+d,
d</code></a></dt>
- <dd>Scroll down one half page.</dd>
+ <dd>Scroll down N half pages (default: 1).</dd>
<dt id="Ctrl+u,~2"><a class="permalink" href="#Ctrl+u,~2"><code class="Cm">Ctrl+u,
u</code></a></dt>
- <dd>Scroll up one half page.</dd>
+ <dd>Scroll up N half pages (default: 1).</dd>
<dt id="Home,~2"><a class="permalink" href="#Home,~2"><code class="Cm">Home,
g</code></a></dt>
<dd>Scroll to the top of the view.</dd>
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 the amount of diff context lines.</dd>
+ <dd>Reduce diff context by N lines (default: 1).</dd>
<dt id="_~2"><a class="permalink" href="#_~2"><code class="Cm">]</code></a></dt>
- <dd>Increase the amount of diff context lines.</dd>
+ <dd>Increase diff context by N lines (default: 1).</dd>
<dt id="_,"><a class="permalink" href="#_,"><code class="Cm"><,
Comma</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 previous (younger)
- commit.</dd>
+ <code class="Cm">log</code> view, move to the Nth previous (younger)
+ commit (default: 1).</dd>
<dt id="_,~2"><a class="permalink" href="#_,~2"><code class="Cm">>,
Full stop</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 next (older)
- commit.</dd>
+ <code class="Cm">log</code> view, move to the Nth next (older) commit
+ (default: 1).</dd>
<dt id="/~2"><a class="permalink" href="#/~2"><code class="Cm">/</code></a></dt>
<dd>Prompt for a search pattern and start searching for matching lines.
The search pattern is an extended regular expression. Regular
expression syntax is documented in
- <a class="Xr">re_format(7)</a>.</dd>
+ <a class="Xr" aria-label="re_format, section 7">re_format(7)</a>.</dd>
<dt id="n~2"><a class="permalink" href="#n~2"><code class="Cm">n</code></a></dt>
- <dd>Find the next line which matches the current search pattern.</dd>
+ <dd>Find the Nth next line which matches the current search pattern
+ (default: 1).</dd>
<dt id="N~2"><a class="permalink" href="#N~2"><code class="Cm">N</code></a></dt>
- <dd>Find the previous line which matches the current search pattern.</dd>
+ <dd>Find the Nth previous line which matches the current search pattern
+ (default: 1).</dd>
<dt id="w"><a class="permalink" href="#w"><code class="Cm">w</code></a></dt>
<dd>Toggle display of whitespace-only changes.</dd>
+ <dt id="A"><a class="permalink" href="#A"><code class="Cm">A</code></a></dt>
+ <dd>Change the diff algorithm. Supported diff algorithms are Myers (quick
+ and dirty) and Patience (slow and tidy). This is a global setting
+ which also affects the <code class="Cm">blame</code> view.</dd>
</dl>
<p class="Pp">The options for <code class="Cm">tog diff</code> are as
follows:</p>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
- this directory is a <a class="Xr">got(1)</a> work tree, use the
- repository path associated with this work tree.</dd>
+ 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="w~2"><a class="permalink" href="#w~2"><code class="Fl">-w</code></a></dt>
<dd>Ignore whitespace-only changes.</dd>
</dl>
<var class="Ar">path</var></dt>
<dd>Display line-by-line history of a file at the specified path.
<p class="Pp">The key bindings for <code class="Cm">tog blame</code> are as
- follows:</p>
+ follows (N denotes optional prefixed count modifier):</p>
<dl class="Bl-tag">
<dt id="Down-arrow,~3"><a class="permalink" href="#Down-arrow,~3"><code class="Cm">Down-arrow,
j, Ctrl-n</code></a></dt>
- <dd>Move the selection cursor down.</dd>
+ <dd>Move the selection cursor down N pages (default: 1).</dd>
<dt id="Up-arrow,~3"><a class="permalink" href="#Up-arrow,~3"><code class="Cm">Up-arrow,
k, Ctrl-p</code></a></dt>
- <dd>Move the selection cursor up.</dd>
+ <dd>Move the selection cursor up N pages (default: 1).</dd>
<dt id="Right-arrow,~3"><a class="permalink" href="#Right-arrow,~3"><code class="Cm">Right-arrow,
l</code></a></dt>
- <dd>Scroll view to the right. File output moves left on the screen.</dd>
+ <dd>Scroll view to the right N increments (default: 1).
+ <br/>
+ File output moves left on the screen.</dd>
<dt id="Left-arrow,~3"><a class="permalink" href="#Left-arrow,~3"><code class="Cm">Left-arrow,
h</code></a></dt>
- <dd>Scroll view to the left. File output moves right on the screen.</dd>
+ <dd>Scroll view to the left N increments (default: 1).
+ <br/>
+ File output moves right on the screen.</dd>
<dt id="$~3"><a class="permalink" href="#$~3"><code class="Cm">$</code></a></dt>
<dd>Scroll view to the rightmost position.</dd>
<dt id="0~3"><a class="permalink" href="#0~3"><code class="Cm">0</code></a></dt>
<dd>Scroll view left to the start of the line.</dd>
<dt id="Page-down,~3"><a class="permalink" href="#Page-down,~3"><code class="Cm">Page-down,
- Space, Ctrl+f</code></a></dt>
- <dd>Move the selection cursor down one page.</dd>
+ Space, Ctrl+f, f</code></a></dt>
+ <dd>Move the selection cursor down N pages (default: 1).</dd>
<dt id="Page-up,~3"><a class="permalink" href="#Page-up,~3"><code class="Cm">Page-up,
- Ctrl+b</code></a></dt>
- <dd>Move the selection cursor up one page.</dd>
+ Ctrl+b, b</code></a></dt>
+ <dd>Move the selection cursor up N pages (default: 1).</dd>
<dt id="Ctrl+d,~3"><a class="permalink" href="#Ctrl+d,~3"><code class="Cm">Ctrl+d,
d</code></a></dt>
- <dd>Move the selection cursor down one half page.</dd>
+ <dd>Move the selection cursor down N half pages (default: 1).</dd>
<dt id="Ctrl+u,~3"><a class="permalink" href="#Ctrl+u,~3"><code class="Cm">Ctrl+u,
u</code></a></dt>
- <dd>Move the selection cursor up one half page.</dd>
+ <dd>Move the selection cursor up N half pages (default: 1).</dd>
<dt id="Home,~3"><a class="permalink" href="#Home,~3"><code class="Cm">Home,
g</code></a></dt>
<dd>Move the selection cursor to the first line of the file.</dd>
<dt id="End,~3"><a class="permalink" href="#End,~3"><code class="Cm">End,
G</code></a></dt>
<dd>Move the selection cursor to the last line of the file.</dd>
- <dt id="Enter"><a class="permalink" href="#Enter"><code class="Cm">Enter</code></a></dt>
+ <dt id="Enter~2"><a class="permalink" href="#Enter~2"><code class="Cm">Enter</code></a></dt>
<dd>Open a <code class="Cm">diff</code> view for the currently selected
line's commit.</dd>
- <dt id="b~2"><a class="permalink" href="#b~2"><code class="Cm">b</code></a></dt>
+ <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 version of the
file as found in the currently selected line's commit.</dd>
<dt id="p"><a class="permalink" href="#p"><code class="Cm">p</code></a></dt>
<dd>Reload the <code class="Cm">blame</code> view with the version of the
file as found in the parent commit of the currently selected line's
commit.</dd>
- <dt id="B~2"><a class="permalink" href="#B~2"><code class="Cm">B</code></a></dt>
+ <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="/~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
expression syntax is documented in
- <a class="Xr">re_format(7)</a>.</dd>
+ <a class="Xr" aria-label="re_format, section 7">re_format(7)</a>.</dd>
<dt id="n~3"><a class="permalink" href="#n~3"><code class="Cm">n</code></a></dt>
- <dd>Find the next line which matches the current search pattern.</dd>
+ <dd>Find the Nth next line which matches the current search pattern
+ (default: 1).</dd>
<dt id="N~3"><a class="permalink" href="#N~3"><code class="Cm">N</code></a></dt>
- <dd>Find the previous line which matches the current search pattern.</dd>
+ <dd>Find the Nth previous line which matches the current search pattern
+ (default: 1).</dd>
+ <dt id="A~2"><a class="permalink" href="#A~2"><code class="Cm">A</code></a></dt>
+ <dd>Change the diff algorithm. Supported diff algorithms are Myers (quick
+ and dirty) and Patience (slow and tidy). This is a global setting
+ which also affects the <code class="Cm">diff</code> view.</dd>
</dl>
<p class="Pp">The options for <code class="Cm">tog blame</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~2"><a class="permalink" href="#c~2"><code class="Fl">-c</code></a>
+ <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
<var class="Ar">commit</var>. The expected argument is the name of a
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
- this directory is a <a class="Xr">got(1)</a> work tree, use the
- repository path associated with this work tree.</dd>
+ 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>
</dl>
</dd>
<dt id="tree"><a class="permalink" href="#tree"><code class="Cm">tree</code></a>
<p class="Pp">Symbolic link entries are also annotated with the target path
of the link.</p>
<p class="Pp">The key bindings for <code class="Cm">tog tree</code> are as
- follows:</p>
+ follows (N denotes optional prefixed count modifier):</p>
<dl class="Bl-tag">
<dt id="Down-arrow,~4"><a class="permalink" href="#Down-arrow,~4"><code class="Cm">Down-arrow,
j, Ctrl-n</code></a></dt>
- <dd>Move the selection cursor down.</dd>
+ <dd>Move the selection cursor down N lines (default: 1).</dd>
<dt id="Up-arrow,~4"><a class="permalink" href="#Up-arrow,~4"><code class="Cm">Up-arrow,
k, Ctrl-p</code></a></dt>
- <dd>Move the selection cursor up.</dd>
+ <dd>Move the selection cursor up N lines (default: 1).</dd>
<dt id="Page-down,~4"><a class="permalink" href="#Page-down,~4"><code class="Cm">Page-down,
- Ctrl+f</code></a></dt>
- <dd>Move the selection cursor down one page.</dd>
+ Space, Ctrl+f, f</code></a></dt>
+ <dd>Move the selection cursor down N pages (default: 1).</dd>
<dt id="Page-up,~4"><a class="permalink" href="#Page-up,~4"><code class="Cm">Page-up,
- Ctrl+b</code></a></dt>
- <dd>Move the selection cursor up one page.</dd>
+ Ctrl+b, b</code></a></dt>
+ <dd>Move the selection cursor up N pages (default: 1).</dd>
<dt id="Ctrl+d,~4"><a class="permalink" href="#Ctrl+d,~4"><code class="Cm">Ctrl+d,
d</code></a></dt>
- <dd>Move the selection cursor down one half page.</dd>
+ <dd>Move the selection cursor down N half pages (default: 1).</dd>
<dt id="Ctrl+u,~4"><a class="permalink" href="#Ctrl+u,~4"><code class="Cm">Ctrl+u,
u</code></a></dt>
- <dd>Move the selection cursor up one half page.</dd>
+ <dd>Move the selection cursor up N half pages (default: 1).</dd>
<dt id="Home,~4"><a class="permalink" href="#Home,~4"><code class="Cm">Home,
g</code></a></dt>
<dd>Move the selection cursor to the first entry.</dd>
<dt id="End,~4"><a class="permalink" href="#End,~4"><code class="Cm">End,
G</code></a></dt>
<dd>Move the selection cursor to the last entry.</dd>
- <dt id="Enter~2"><a class="permalink" href="#Enter~2"><code class="Cm">Enter</code></a></dt>
+ <dt id="Enter~3"><a class="permalink" href="#Enter~3"><code class="Cm">Enter</code></a></dt>
<dd>Enter the currently selected directory, or switch to the
<code class="Cm">blame</code> view for the currently selected
file.</dd>
<code class="Cm">tree</code> view for arbitrary branches and
tags.</dd>
<dt id="Backspace~2"><a class="permalink" href="#Backspace~2"><code class="Cm">Backspace</code></a></dt>
- <dd>Move back to the parent directory.</dd>
+ <dd>Move back to the Nth parent directory (default: 1).</dd>
<dt id="i"><a class="permalink" href="#i"><code class="Cm">i</code></a></dt>
<dd>Show object IDs for all objects displayed in the
<code class="Cm">tree</code> view.</dd>
<dd>Prompt for a search pattern and start searching for matching tree
entries. The search pattern is an extended regular expression which is
matched against the tree entry's name. Regular expression syntax is
- documented in <a class="Xr">re_format(7)</a>.</dd>
+ documented in <a class="Xr" aria-label="re_format, section
+ 7">re_format(7)</a>.</dd>
<dt id="n~4"><a class="permalink" href="#n~4"><code class="Cm">n</code></a></dt>
- <dd>Find the next tree entry which matches the current search
- pattern.</dd>
+ <dd>Find the Nth next tree entry which matches the current search pattern
+ (default: 1).</dd>
<dt id="N~4"><a class="permalink" href="#N~4"><code class="Cm">N</code></a></dt>
- <dd>Find the previous tree entry which matches the current search
- pattern.</dd>
+ <dd>Find the Nth previous tree entry which matches the current search
+ pattern (default: 1).</dd>
</dl>
<p class="Pp">The options for <code class="Cm">tog tree</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~3"><a class="permalink" href="#c~3"><code class="Fl">-c</code></a>
+ <dt id="c~4"><a class="permalink" href="#c~4"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Start traversing history at the specified
<var class="Ar">commit</var>. The expected argument is the name of a
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
- this directory is a <a class="Xr">got(1)</a> work tree, use the
- repository path associated with this work tree.</dd>
+ 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>
</dl>
</dd>
<dt id="ref"><a class="permalink" href="#ref"><code class="Cm">ref</code></a>
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]</dt>
<dd>Display references in the repository.
<p class="Pp">The key bindings for <code class="Cm">tog ref</code> are as
- follows:</p>
+ follows (N denotes optional prefixed count modifier):</p>
<dl class="Bl-tag">
<dt id="Down-arrow,~5"><a class="permalink" href="#Down-arrow,~5"><code class="Cm">Down-arrow,
j, Ctrl-n</code></a></dt>
- <dd>Move the selection cursor down.</dd>
+ <dd>Move the selection cursor down N lines (default: 1).</dd>
<dt id="Up-arrow,~5"><a class="permalink" href="#Up-arrow,~5"><code class="Cm">Up-arrow,
k, Ctrl-p</code></a></dt>
- <dd>Move the selection cursor up.</dd>
+ <dd>Move the selection cursor up N lines (default: 1).</dd>
<dt id="Page-down,~5"><a class="permalink" href="#Page-down,~5"><code class="Cm">Page-down,
- Ctrl+f</code></a></dt>
- <dd>Move the selection cursor down one page.</dd>
+ Space, Ctrl+f, f</code></a></dt>
+ <dd>Move the selection cursor down N pages (default: 1).</dd>
<dt id="Page-up,~5"><a class="permalink" href="#Page-up,~5"><code class="Cm">Page-up,
- Ctrl+b</code></a></dt>
- <dd>Move the selection cursor up one page.</dd>
+ Ctrl+b, b</code></a></dt>
+ <dd>Move the selection cursor up N pages (default: 1).</dd>
<dt id="Ctrl+d,~5"><a class="permalink" href="#Ctrl+d,~5"><code class="Cm">Ctrl+d,
d</code></a></dt>
- <dd>Move the selection cursor down one half page.</dd>
+ <dd>Move the selection cursor down N half pages (default: 1).</dd>
<dt id="Ctrl+u,~5"><a class="permalink" href="#Ctrl+u,~5"><code class="Cm">Ctrl+u,
u</code></a></dt>
- <dd>Move the selection cursor up one half page.</dd>
+ <dd>Move the selection cursor up N half pages (default: 1).</dd>
<dt id="Home,~5"><a class="permalink" href="#Home,~5"><code class="Cm">Home,
g</code></a></dt>
<dd>Move the selection cursor to the first reference.</dd>
<dt id="End,~5"><a class="permalink" href="#End,~5"><code class="Cm">End,
G</code></a></dt>
<dd>Move the selection cursor to the last reference.</dd>
- <dt id="Enter~3"><a class="permalink" href="#Enter~3"><code class="Cm">Enter</code></a></dt>
+ <dt id="Enter~4"><a class="permalink" href="#Enter~4"><code class="Cm">Enter</code></a></dt>
<dd>Open a <code class="Cm">log</code> view which begins traversing
history at the commit resolved via the currently selected
reference.</dd>
<dd>Prompt for a search pattern and start searching for matching
references. The search pattern is an extended regular expression which
is matched against absolute reference names. Regular expression syntax
- is documented in <a class="Xr">re_format(7)</a>.</dd>
+ is documented in <a class="Xr" aria-label="re_format, section
+ 7">re_format(7)</a>.</dd>
<dt id="n~5"><a class="permalink" href="#n~5"><code class="Cm">n</code></a></dt>
- <dd>Find the next reference which matches the current search pattern.</dd>
+ <dd>Find the Nth next reference which matches the current search pattern
+ (default: 1).</dd>
<dt id="N~5"><a class="permalink" href="#N~5"><code class="Cm">N</code></a></dt>
- <dd>Find the previous reference which matches the current search
- pattern.</dd>
+ <dd>Find the Nth previous reference which matches the current search
+ pattern (default: 1).</dd>
<dt id="Ctrl+l~2"><a class="permalink" href="#Ctrl+l~2"><code class="Cm">Ctrl+l</code></a></dt>
<dd>Reload the list of references displayed by the
<code class="Cm">ref</code> view.</dd>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
repository is located at or above the current working directory. If
- this directory is a <a class="Xr">got(1)</a> work tree, use the
- repository path associated with this work tree.</dd>
+ 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>
</dl>
</dd>
</dl>
<section class="Sh">
<h1 class="Sh" id="ENVIRONMENT"><a class="permalink" href="#ENVIRONMENT">ENVIRONMENT</a></h1>
<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>.
+ Supported diff algorithms are Myers (quick and dirty) and Patience (slow
+ and tidy). Valid values for <code class="Ev">TOG_DIFF_ALGORITHM</code> are
+ “patience” and “myers”. If unset, the Myers
+ diff algorithm will be used by default.</dd>
+ <dt id="TOG_VIEW_SPLIT_MODE"><a class="permalink" href="#TOG_VIEW_SPLIT_MODE"><code class="Ev">TOG_VIEW_SPLIT_MODE</code></a></dt>
+ <dd>Determines whether <code class="Nm">tog</code> will use vertical or
+ horizontal split for split-screen views. If set to “h” then
+ split-screen views will be split horizontally. Otherwise, split-screen
+ views will be split vertically.</dd>
<dt id="TOG_COLORS"><a class="permalink" href="#TOG_COLORS"><code class="Ev">TOG_COLORS</code></a></dt>
<dd><code class="Nm">tog</code> shows colorized output if this variable is set
to a non-empty value. The default color scheme can be modified by setting
<section class="Sh">
<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h1>
-<p class="Pp"><a class="Xr">got(1)</a>, <a class="Xr">git-repository(5)</a>,
- <a class="Xr">re_format(7)</a></p>
+<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>
</div>
<table class="foot">
<tr>
- <td class="foot-date">June 18, 2022</td>
+ <td class="foot-date">July 4, 2022</td>
<td class="foot-os">OpenBSD 7.1</td>
</tr>
</table>
