commit - 8e7a84a9edef535e766bcc00affe76d0d1c1a182
commit + 46043f6f089d22d60f5cb39d56b0763299a79b11
blob - d99d5541b2ccc53d129dfc95a34d71f73d440c5c
blob + 30fe9d230440b31cf7069ecbce08bdbc36471c06
--- git-repository.5.html
+++ git-repository.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 21, 2021</td>
+ <td class="foot-date">November 23, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - aa43f966603ce6fd047ce0f145ed67462c206787
blob + f48e9d886be4a6d54c86f12344fc56bc00bfc4f3
--- got-worktree.5.html
+++ got-worktree.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 21, 2021</td>
+ <td class="foot-date">November 23, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 4f87fa44cd6c805c62f84f37dca21216bcacb085
blob + f43159ebbbea6be87a33ddd6175bbbfcbace6e31
--- got.1.html
+++ got.1.html
<var class="Ar">directory</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">im</code></code></div>
- ) Create an initial commit in a repository from the file hierarchy within
- the specified <var class="Ar">directory</var>. The created commit will not
+ <code class="Cm">im</code>)</code></div>
+ Create an initial commit in a repository from the file hierarchy within the
+ specified <var class="Ar">directory</var>. The created commit will not
have any parent commits, i.e. it will be a root commit. Also create a new
reference which provides a branch name for the newly created commit. Show
the path of each imported file to indicate progress.
[<var class="Ar">directory</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">cl</code></code></div>
- ) Clone a Git repository at the specified
- <var class="Ar">repository-URL</var> into the specified
- <var class="Ar">directory</var>. If no <var class="Ar">directory</var> is
- specified the directory name will be derived from the name of the cloned
- repository. <code class="Cm">got clone</code> will refuse to run if the
- <var class="Ar">directory</var> already exists.
+ <code class="Cm">cl</code>)</code></div>
+ Clone a Git repository at the specified <var class="Ar">repository-URL</var>
+ into the specified <var class="Ar">directory</var>. If no
+ <var class="Ar">directory</var> is specified the directory name will be
+ derived from the name of the cloned repository. <code class="Cm">got
+ clone</code> will refuse to run if the <var class="Ar">directory</var>
+ already exists.
<p class="Pp">The <var class="Ar">repository-URL</var> specifies a protocol
scheme, a server hostname, an optional port number separated from the
hostname by a colon, and a path to the repository on the server:
[<code class="Fl">-X</code>] [<var class="Ar">remote-repository</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">fe</code></code></div>
- ) Fetch new changes from a remote repository. If no
+ <code class="Cm">fe</code>)</code></div>
+ 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
[<var class="Ar">work-tree-path</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">co</code></code></div>
- ) Copy files from a repository into a new work tree. Show the status of each
+ <code class="Cm">co</code>)</code></div>
+ Copy files from a repository into a new work tree. Show the status of each
affected file, using the following status codes:
<table class="Bl-column">
<tr>
[<code class="Fl">-q</code>] [<var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">up</code></code></div>
- ) Update an existing work tree to a different <var class="Ar">commit</var>.
+ <code class="Cm">up</code>)</code></div>
+ Update an existing work tree to a different <var class="Ar">commit</var>.
Change existing files in the work tree as necessary to match file contents
of this commit. Preserve any local changes in the work tree and merge them
with the incoming changes.
<var class="Ar">status-codes</var>] [<var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">st</code></code></div>
- ) Show the current modification status of files in a work tree, using the
+ <code class="Cm">st</code>)</code></div>
+ Show the current modification status of files in a work tree, using the
following status codes:
<table class="Bl-column">
<tr>
<var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">di</code></code></div>
- ) When invoked within a work tree without any arguments, display all local
+ <code class="Cm">di</code>)</code></div>
+ When invoked within a work tree without any arguments, display all local
changes in the work tree. If one or more <var class="Ar">path</var>
arguments are specified, only show changes within the specified paths.
<p class="Pp">If two arguments are provided, treat each argument as a
<var class="Ar">path</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">bl</code></code></div>
- ) Display line-by-line history of a file at the specified path.
+ <code class="Cm">bl</code>)</code></div>
+ Display line-by-line history of a file at the specified path.
<p class="Pp">The options for <code class="Cm">got blame</code> are as
follows:</p>
<dl class="Bl-tag">
[<var class="Ar">path</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">tr</code></code></div>
- ) Display a listing of files and directories at the specified directory path
+ <code class="Cm">tr</code>)</code></div>
+ Display a listing of files and directories at the specified directory path
in the repository. Entries shown in this listing may carry one of the
following trailing annotations:
<table class="Bl-column">
</dd>
<dt id="ref"><a class="permalink" href="#ref"><code class="Cm">ref</code></a>
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
- [<code class="Fl">-l</code>] [<code class="Fl">-c</code>
- <var class="Ar">object</var>] [<code class="Fl">-s</code>
- <var class="Ar">reference</var>] [<code class="Fl">-d</code>]
- [<var class="Ar">name</var>]</dt>
+ [<code class="Fl">-l</code>] [<code class="Fl">-t</code>]
+ [<code class="Fl">-c</code> <var class="Ar">object</var>]
+ [<code class="Fl">-s</code> <var class="Ar">reference</var>]
+ [<code class="Fl">-d</code>] [<var class="Ar">name</var>]</dt>
<dd>Manage references in a repository.
<p class="Pp">References may be listed, created, deleted, and changed. When
creating, deleting, or changing a reference the specified
<var class="Ar">name</var> is a reference namespace, list all
references in this namespace. Otherwise, show only the reference with
the given <var class="Ar">name</var>. Cannot be used together with any
- other options except <code class="Fl">-r</code>.</dd>
+ other options except <code class="Fl">-r</code> and
+ <code class="Fl">-t</code>.</dd>
+ <dt id="t~2"><a class="permalink" href="#t~2"><code class="Fl">-t</code></a></dt>
+ <dd>Sort listed references by modification time (most recently modified
+ first) instead of sorting by lexicographical order. Use of this option
+ requires the <code class="Fl">-l</code> option to be used as
+ well.</dd>
<dt id="c~7"><a class="permalink" href="#c~7"><code class="Fl">-c</code></a>
<var class="Ar">object</var></dt>
<dd>Create a reference or change an existing reference. The reference with
[<var class="Ar">name</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">br</code></code></div>
- ) Create, list, or delete branches.
+ <code class="Cm">br</code>)</code></div>
+ Create, list, or delete branches.
<p class="Pp">Local branches are managed via references which live in the
“refs/heads/” reference namespace. The
<code class="Cm">got branch</code> command creates references in this
</tr>
</table>
</dd>
+ <dt id="t~3"><a class="permalink" href="#t~3"><code class="Fl">-t</code></a></dt>
+ <dd>Sort listed branches by modification time (most recently modified
+ first) instead of sorting by lexicographical order. Branches in the
+ “refs/heads/” reference namespace are listed before
+ branches in “refs/remotes/” regardless. Use of this
+ option requires the <code class="Fl">-l</code> option to be used as
+ well.</dd>
<dt id="d~3"><a class="permalink" href="#d~3"><code class="Fl">-d</code></a>
<var class="Ar">name</var></dt>
<dd>Delete the branch with the specified <var class="Ar">name</var> from
<var class="Ar">status-codes</var>] <var class="Ar">path ...</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">rm</code></code></div>
- ) Remove versioned files from a work tree and schedule them for deletion
- from the repository in the next commit.
+ <code class="Cm">rm</code>)</code></div>
+ Remove versioned files from a work tree and schedule them for deletion from
+ the repository in the next commit.
<p class="Pp">The options for <code class="Cm">got remove</code> are as
follows:</p>
<dl class="Bl-tag">
<var class="Ar">path ...</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">rv</code></code></div>
- ) Revert any local changes in files at the specified paths in a work tree.
+ <code class="Cm">rv</code>)</code></div>
+ Revert any local changes in files at the specified paths in a work tree.
File contents will be overwritten with those contained in the work tree's
base commit. There is no way to bring discarded changes back after
<code class="Cm">got revert</code>!
[<var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">ci</code></code></div>
- ) Create a new commit in the repository from changes in a work tree and use
+ <code class="Cm">ci</code>)</code></div>
+ Create a new commit in the repository from changes in a work tree and use
this commit as the new base commit for the work tree. If no
<var class="Ar">path</var> is specified, commit all changes in the work
tree. Otherwise, commit changes at or within the specified paths.
[<code class="Fl">-v</code>] [<var class="Ar">remote-repository</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">se</code></code></div>
- ) Send new changes to a remote repository. If no
+ <code class="Cm">se</code>)</code></div>
+ 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
repository is located at or above the current working directory. If
this directory is a <code class="Nm">got</code> work tree, use the
repository path associated with this work tree.</dd>
- <dt id="t~2"><a class="permalink" href="#t~2"><code class="Fl">-t</code></a>
+ <dt id="t~4"><a class="permalink" href="#t~4"><code class="Fl">-t</code></a>
<var class="Ar">tag</var></dt>
<dd>Send the specified <var class="Ar">tag</var> from the local
repository's “refs/tags/” reference namespace, in
<var class="Ar">commit</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">cy</code></code></div>
- ) Merge changes from a single <var class="Ar">commit</var> into the work
- tree. The specified <var class="Ar">commit</var> should be on a different
- branch than the work tree's base commit. The expected argument is a
- reference or a commit ID SHA1 hash. An abbreviated hash argument will be
- expanded to a full SHA1 hash automatically, provided the abbreviation is
- unique.
+ <code class="Cm">cy</code>)</code></div>
+ Merge changes from a single <var class="Ar">commit</var> into the work tree.
+ The specified <var class="Ar">commit</var> should be on a different branch
+ than the work tree's base commit. The expected argument is a reference or
+ a commit ID SHA1 hash. An abbreviated hash argument will be expanded to a
+ full SHA1 hash automatically, provided the abbreviation is unique.
<p class="Pp">Show the status of each affected file, using the following
status codes:</p>
<table class="Bl-column">
<var class="Ar">commit</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">bo</code></code></div>
- ) Reverse-merge changes from a single <var class="Ar">commit</var> into the
+ <code class="Cm">bo</code>)</code></div>
+ Reverse-merge changes from a single <var class="Ar">commit</var> into the
work tree. The specified <var class="Ar">commit</var> should be on the
same branch as the work tree's base commit. The expected argument is a
reference or a commit ID SHA1 hash. An abbreviated hash argument will be
[<var class="Ar">branch</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">rb</code></code></div>
- ) Rebase commits on the specified <var class="Ar">branch</var> onto the tip
- of the current branch of the work tree. The <var class="Ar">branch</var>
- must share common ancestry with the work tree's current branch. Rebasing
- begins with the first descendant commit of the youngest common ancestor
- commit shared by the specified <var class="Ar">branch</var> and the work
- tree's current branch, and stops once the tip commit of the specified
+ <code class="Cm">rb</code>)</code></div>
+ Rebase commits on the specified <var class="Ar">branch</var> onto the tip of
+ the current branch of the work tree. The <var class="Ar">branch</var> must
+ share common ancestry with the work tree's current branch. Rebasing begins
+ with the first descendant commit of the youngest common ancestor commit
+ shared by the specified <var class="Ar">branch</var> and the work tree's
+ current branch, and stops once the tip commit of the specified
<var class="Ar">branch</var> has been rebased.
<p class="Pp">When <code class="Cm">got rebase</code> is used as intended,
the specified <var class="Ar">branch</var> represents a local commit
<code class="Cm">got commit</code> commands will refuse to run while a
rebase operation is in progress. Other commands which manipulate the
work tree may be used for conflict resolution purposes.</p>
+ <p class="Pp">If the specified <var class="Ar">branch</var> is already based
+ on the work tree's current branch then no commits need to be rebased and
+ <code class="Cm">got rebase</code> will simply switch the work tree to
+ the specified <var class="Ar">branch</var> and update files in the work
+ tree accordingly.</p>
<p class="Pp">The options for <code class="Cm">got rebase</code> are as
follows:</p>
<dl class="Bl-tag">
[<code class="Fl">-X</code>] [<var class="Ar">branch</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">he</code></code></div>
- ) Edit commit history between the work tree's current base commit and the
- tip commit of the work tree's current branch.
+ <code class="Cm">he</code>)</code></div>
+ Edit commit history between the work tree's current base commit and the tip
+ commit of the work tree's current branch.
<p class="Pp">Before starting a <code class="Cm">histedit</code> operation
the work tree's current branch must be set with <code class="Cm">got
update -b</code> to the branch which should be edited, unless this
<var class="Ar">branch</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">ig</code></code></div>
- ) Integrate the specified <var class="Ar">branch</var> into the work tree's
+ <code class="Cm">ig</code>)</code></div>
+ Integrate the specified <var class="Ar">branch</var> into the work tree's
current branch. Files in the work tree are updated to match the contents
on the integrated <var class="Ar">branch</var>, and the reference of the
work tree's branch is changed to point at the head commit of the
[<code class="Fl">-n</code>] [<var class="Ar">branch</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">mg</code></code></div>
- ) Create a merge commit based on the current branch of the work tree and the
+ <code class="Cm">mg</code>)</code></div>
+ Create a merge commit based on the current branch of the work tree and the
specified <var class="Ar">branch</var>. If a linear project history is
desired, then use of <code class="Cm">got rebase</code> should be
preferred over <code class="Cm">got merge</code>. However, even strictly
[<code class="Fl">-S</code>] [<var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">sg</code></code></div>
- ) Stage local changes for inclusion in the next commit. If no
+ <code class="Cm">sg</code>)</code></div>
+ Stage local changes for inclusion in the next commit. If no
<var class="Ar">path</var> is specified, stage all changes in the work
tree. Otherwise, stage changes at or within the specified paths. Paths may
be staged if they are added, modified, or deleted according to
<var class="Ar">response-script</var>] [<var class="Ar">path ...</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">ug</code></code></div>
- ) Merge staged changes back into the work tree and put affected paths back
+ <code class="Cm">ug</code>)</code></div>
+ Merge staged changes back into the work tree and put affected paths back
into non-staged status. If no <var class="Ar">path</var> is specified,
unstage all staged changes across the entire work tree. Otherwise, unstage
changes at or within the specified paths.
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 21, 2021</td>
+ <td class="foot-date">November 23, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - e79baf26bbf3a2a760329bf980cfa2dcf57b2bb9
blob + d4f8efa1e3d6ac22a279ed5823b7f206a7ef9cb4
--- got.conf.5.html
+++ got.conf.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 21, 2021</td>
+ <td class="foot-date">November 23, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 32a27e3ba20122598397cae32d358b896f443c02
blob + 22e105c0e96b8f0fa0c3fd1d4b508337c7722d0d
--- gotadmin.1.html
+++ gotadmin.1.html
<dt id="r"><a class="permalink" href="#r"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
- repository is located at or above the current working directory.</dd>
+ repository is located at or above the current working directory. If
+ this directory is a <a class="Xr">got(1)</a> work tree, use the
+ repository path associated with this work tree.</dd>
</dl>
</dd>
<dt id="pack"><a class="permalink" href="#pack"><code class="Cm">pack</code></a>
<dt id="r~2"><a class="permalink" href="#r~2"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
- repository is located at or above the current working directory.</dd>
+ repository is located at or above the current working directory. If
+ this directory is a <a class="Xr">got(1)</a> work tree, use the
+ repository path associated with this work tree.</dd>
<dt id="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
<var class="Ar">packfile-path</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">ix</code></code></div>
- ) Create a pack index for the pack file at
+ <code class="Cm">ix</code>)</code></div>
+ 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
<var class="Ar">packfile-path</var></dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">ls</code></code></div>
- ) List the contents of the pack file at <var class="Ar">packfile-path</var>.
+ <code class="Cm">ls</code>)</code></div>
+ List the contents of the pack file at <var class="Ar">packfile-path</var>.
<p class="Pp">Each object contained in the pack file will be displayed on a
single line. The information shown includes the object ID, object type,
object offset, and object size.</p>
<var class="Ar">repository-path</var>] [<code class="Fl">-q</code>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
- <code class="Cm">cl</code></code></div>
- ) Purge unreferenced loose objects from the repository and display the
- amount of disk space which has been freed as a result.
+ <code class="Cm">cl</code>)</code></div>
+ Purge unreferenced loose objects from the repository and display the amount
+ of disk space which has been freed as a result.
<p class="Pp">Unreferenced objects are present in the repository but cannot
be reached via any reference in the entire <span class="Pa">refs/</span>
namespace.</p>
<dt id="r~3"><a class="permalink" href="#r~3"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
- repository is located at or above the current working directory.</dd>
+ repository is located at or above the current working directory. If
+ this directory is a <a class="Xr">got(1)</a> work tree, use the
+ repository path associated with this work tree.</dd>
<dt id="q"><a class="permalink" href="#q"><code class="Fl">-q</code></a></dt>
<dd>Suppress progress reporting and disk space summary output.</dd>
</dl>
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 21, 2021</td>
+ <td class="foot-date">November 23, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 31b7133c75daedb5bc0e0be4d7203106bc7bfa68
blob + 9e3dd092ffa0f492a71c162a6a2f358b44eaa6ab
--- gotweb.8.html
+++ gotweb.8.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 21, 2021</td>
+ <td class="foot-date">November 23, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 65ad33de7291852671ad35ae6a6d301a4778cb5e
blob + 64f0e6603fdb1b079894be0a5d5f2b0dbffe2878
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 21, 2021</td>
+ <td class="foot-date">November 23, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - bf20087d498dd640ad1fbb6fb9e0765a260b6cbf
blob + 005d0431bcaa7b19588756420dbb232fb0df9ada
--- tog.1.html
+++ tog.1.html
<dt id="i~2"><a class="permalink" href="#i~2"><code class="Cm">i</code></a></dt>
<dd>Show object IDs for all non-symbolic references displayed in the
<code class="Cm">ref</code> view.</dd>
+ <dt id="o"><a class="permalink" href="#o"><code class="Cm">o</code></a></dt>
+ <dd>Toggle display order of references between sort by name and sort by
+ timestamp.</dd>
<dt id="/~5"><a class="permalink" href="#/~5"><code class="Cm">/</code></a></dt>
<dd>Prompt for a search pattern and start searching for matching
references. The search pattern is an extended regular expression which
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 21, 2021</td>
+ <td class="foot-date">November 23, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
