commit - ef1f07d6c26bcb8099862f56114396ede2fee5bf
commit + 039953c9e4a0736bf3e6ea3dc09992bdc2f7b244
blob - 130fe0700abd2791e970ade87f388af70253636f
blob + ec49f4929b2b059a5a0a4b6f3d2250df1170032e
--- git-repository.5.html
+++ git-repository.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">December 27, 2020</td>
+ <td class="foot-date">March 22, 2021</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - a77994fccee32fc711f3278ee43b06b53a335f00
blob + 14cb2ad12a632d715a84f743680ee81f01533f7a
--- got-worktree.5.html
+++ got-worktree.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">December 27, 2020</td>
+ <td class="foot-date">March 22, 2021</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - edfff52eddc2a5136e07ff423703cca01f218a0b
blob + 00cdf8ed340cbda76be55b3f69d01f753996e033
--- got.1.html
+++ got.1.html
<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> for future use by
- <code class="Cm">got fetch</code> or <a class="Xr">git-fetch(1)</a>.</p>
+ 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>
<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. 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>
+ “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>
<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
<dt id="l"><a class="permalink" href="#l"><code class="Fl">-l</code></a></dt>
<dd>List branches and tags available for fetching from the remote
repository and exit immediately. Cannot be used together with any of
- the other options except <code class="Fl">-v</code>.</dd>
+ the other options except <code class="Fl">-q</code> and
+ <code class="Fl">-v</code>.</dd>
<dt id="m~2"><a class="permalink" href="#m~2"><code class="Fl">-m</code></a></dt>
<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
<dl class="Bl-tag">
<dt id="a~2"><a class="permalink" href="#a~2"><code class="Fl">-a</code></a></dt>
<dd>Fetch all branches from the remote repository's
- “refs/heads/” reference namespace. 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>
+ “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>
<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
<dt id="l~2"><a class="permalink" href="#l~2"><code class="Fl">-l</code></a></dt>
<dd>List branches and tags available for fetching from the remote
repository and exit immediately. Cannot be used together with any of
- the other options except <code class="Fl">-v</code> and
- <code class="Fl">-r</code>.</dd>
+ the other options except <code class="Fl">-v</code>,
+ <code class="Fl">-q</code>, and <code class="Fl">-r</code>.</dd>
<dt id="t"><a class="permalink" href="#t"><code class="Fl">-t</code></a></dt>
<dd>Allow existing references in the “refs/tags” namespace
to be updated if they have changed on the server. If not specified,
commits in reverse order.</dd>
<dt id="x"><a class="permalink" href="#x"><code class="Fl">-x</code></a>
<var class="Ar">commit</var></dt>
- <dd>Stop traversing commit history as soon as the specified
+ <dd>Stop traversing commit history immediately after the specified
<var class="Ar">commit</var> has been traversed. This option has no
effect if the specified <var class="Ar">commit</var> is never
traversed.</dd>
<code class="Fl">-r</code>.</dd>
<dt id="d~2"><a class="permalink" href="#d~2"><code class="Fl">-d</code></a></dt>
<dd>Delete the reference with the specified <var class="Ar">name</var>
- from the repository. Cannot be used together with any other options
- except <code class="Fl">-r</code>.</dd>
+ from the repository. Any commit, tree, tag, and blob objects belonging
+ to deleted references remain in the repository and may be removed
+ separately with Git's garbage collector. Cannot be used together with
+ any other options except <code class="Fl">-r</code>.</dd>
</dl>
</dd>
<dt id="branch"><a class="permalink" href="#branch"><code class="Cm">branch</code></a>
<var class="Ar">name</var>] [<code class="Fl">-n</code>]
[<var class="Ar">name</var>]</dt>
<dd>Create, list, or delete branches.
- <p class="Pp">Branches are managed via references which live in the
+ <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 operates on references in
- this namespace only.</p>
+ <code class="Cm">got branch</code> command creates or deletes references
+ in this namespace only.</p>
<p class="Pp">If invoked in a work tree without any arguments, print the
name of the work tree's current branch.</p>
<p class="Pp">If a <var class="Ar">name</var> argument is passed, attempt to
this directory is a <code class="Nm">got</code> work tree, use the
repository path associated with this work tree.</dd>
<dt id="l~5"><a class="permalink" href="#l~5"><code class="Fl">-l</code></a></dt>
- <dd>List all existing branches in the repository. If invoked in a work
- tree, the work tree's current branch is shown with one the following
- annotations:
+ <dd>List all existing branches in the repository, including copies of
+ remote repositories' branches in the “refs/remotes/”
+ reference namespace.
+ <p class="Pp">If invoked in a work tree, the work tree's current branch
+ is shown with one the following annotations:</p>
<table class="Bl-column">
<tr>
<td>*</td>
<dt id="rv"><a class="permalink" href="#rv"><code class="Cm">rv</code></a></dt>
<dd>Short alias for <code class="Cm">revert</code>.</dd>
<dt id="commit"><a class="permalink" href="#commit"><code class="Cm">commit</code></a>
+ [<code class="Fl">-F</code> <var class="Ar">path</var>]
[<code class="Fl">-m</code> <var class="Ar">message</var>]
- [<code class="Fl">-S</code>] [<var class="Ar">path ...</var>]</dt>
+ [<code class="Fl">-N</code>] [<code class="Fl">-S</code>]
+ [<var class="Ar">path ...</var>]</dt>
<dd>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
<p class="Pp">If changes have been explicitly staged for commit with
<code class="Cm">got stage</code>, only commit staged changes and reject
any specified paths which have not been staged.</p>
+ <p class="Pp"><code class="Cm">got commit</code> opens a temporary file in
+ an editor where a log message can be written unless the
+ <code class="Fl">-m</code> option is used or the
+ <code class="Fl">-F</code> and <code class="Fl">-N</code> options are
+ used together.</p>
<p class="Pp">Show the status of each affected file, using the following
status codes:</p>
<table class="Bl-column">
<p class="Pp">The options for <code class="Cm">got commit</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="F~2"><a class="permalink" href="#F~2"><code class="Fl">-F</code></a>
+ <var class="Ar">path</var></dt>
+ <dd>Use the prepared log message stored in the file found at
+ <var class="Ar">path</var> when creating the new commit.
+ <code class="Cm">got commit</code> opens a temporary file in an editor
+ where the prepared log message can be reviewed and edited further if
+ needed. Cannot be used together with the <code class="Fl">-m</code>
+ option.</dd>
<dt id="m~4"><a class="permalink" href="#m~4"><code class="Fl">-m</code></a>
<var class="Ar">message</var></dt>
- <dd>Use the specified log message when creating the new commit. Without
- the <code class="Fl">-m</code> option, <code class="Cm">got
- commit</code> opens a temporary file in an editor where a log message
- can be written.</dd>
+ <dd>Use the specified log message when creating the new commit. Cannot be
+ used together with the <code class="Fl">-F</code> option.</dd>
+ <dt id="N"><a class="permalink" href="#N"><code class="Fl">-N</code></a></dt>
+ <dd>This option prevents <code class="Cm">got commit</code> from opening
+ the commit message in an editor. It has no effect unless it is used
+ together with the <code class="Fl">-F</code> option and is intended
+ for non-interactive use such as scripting.</dd>
<dt id="S"><a class="permalink" href="#S"><code class="Fl">-S</code></a></dt>
<dd>Allow the addition of symbolic links which point outside of the path
space that is under version control. By default, <code class="Cm">got
<dd>Short alias for <code class="Cm">backout</code>.</dd>
<dt id="rebase"><a class="permalink" href="#rebase"><code class="Cm">rebase</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
- [<var class="Ar">branch</var>]</dt>
+ [<code class="Fl">-l</code>] [<var class="Ar">branch</var>]</dt>
<dd>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
rebasing has completed successfully, the temporary branch becomes the
new version of the specified <var class="Ar">branch</var> and the work
tree is automatically switched to it.</p>
+ <p class="Pp">Old commits in their pre-rebase state are automatically backed
+ up in the “refs/got/backup/rebase” reference namespace. As
+ long as these references are not removed older versions of rebased
+ commits will remain in the repository and can be viewed with the
+ <code class="Cm">got rebase -l</code> command. Removal of these
+ references makes objects which become unreachable via any reference
+ subject to removal by Git's garbage collector.</p>
<p class="Pp">While rebasing commits, show the status of each affected file,
using the following status codes:</p>
<table class="Bl-column">
<dt id="c~9"><a class="permalink" href="#c~9"><code class="Fl">-c</code></a></dt>
<dd>Continue an interrupted rebase operation. If this option is used, no
other command-line arguments are allowed.</dd>
+ <dt id="l~7"><a class="permalink" href="#l~7"><code class="Fl">-l</code></a></dt>
+ <dd>Show a list of past rebase operations, represented by references in
+ the “refs/got/backup/rebase” reference namespace.
+ <p class="Pp">Display the author, date, and log message of each backed
+ up commit, the object ID of the corresponding post-rebase commit,
+ and the object ID of their common ancestor commit. Given these
+ object IDs, the <code class="Cm">got log</code> command with the
+ <code class="Fl">-c</code> and <code class="Fl">-x</code> options
+ can be used to examine the history of either version of the branch,
+ and the <code class="Cm">got branch</code> command with the
+ <code class="Fl">-c</code> option can be used to create a new branch
+ from a pre-rebase state if desired.</p>
+ <p class="Pp">If a <var class="Ar">branch</var> is specified, only show
+ commits which at some point in time represented this branch.
+ Otherwise, list all backed up commits for any branches.</p>
+ <p class="Pp">If this option is used, <code class="Cm">got rebase</code>
+ does not require a work tree. None of the other options can be used
+ together with <code class="Fl">-l</code>.</p>
+ </dd>
</dl>
</dd>
<dt id="rb"><a class="permalink" href="#rb"><code class="Cm">rb</code></a></dt>
<dt id="histedit"><a class="permalink" href="#histedit"><code class="Cm">histedit</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
[<code class="Fl">-f</code>] [<code class="Fl">-F</code>
- <var class="Ar">histedit-script</var>] [<code class="Fl">-m</code>]</dt>
+ <var class="Ar">histedit-script</var>] [<code class="Fl">-m</code>]
+ [<code class="Fl">-l</code>] [<var class="Ar">branch</var>]</dt>
<dd>Edit commit history between the work tree's current base commit and the
tip commit of the work tree's current branch.
<p class="Pp">Before starting a <code class="Cm">histedit</code> operation
operation. Once history editing has completed successfully, the
temporary branch becomes the new version of the work tree's branch and
the work tree is automatically switched to it.</p>
+ <p class="Pp">Old commits in their pre-histedit state are automatically
+ backed up in the “refs/got/backup/histedit” reference
+ namespace. As long as these references are not removed older versions of
+ edited commits will remain in the repository and can be viewed with the
+ <code class="Cm">got histedit -l</code> command. Removal of these
+ references makes objects which become unreachable via any reference
+ subject to removal by Git's garbage collector.</p>
<p class="Pp">While merging commits, show the status of each affected file,
using the following status codes:</p>
<table class="Bl-column">
them all into one commit. The <code class="Fl">-f</code> option can
only be used when starting a new histedit operation. If this option is
used, no other command-line arguments are allowed.</dd>
- <dt id="F~2"><a class="permalink" href="#F~2"><code class="Fl">-F</code></a>
+ <dt id="F~3"><a class="permalink" href="#F~3"><code class="Fl">-F</code></a>
<var class="Ar">histedit-script</var></dt>
<dd>Use the specified <var class="Ar">histedit-script</var> instead of
opening a temporary file in an editor where a histedit script can be
every picked commit as-is. The <code class="Fl">-m</code> option can
only be used when starting a new histedit operation. If this option is
used, no other command-line arguments are allowed.</dd>
+ <dt id="l~8"><a class="permalink" href="#l~8"><code class="Fl">-l</code></a></dt>
+ <dd>Show a list of past histedit operations, represented by references in
+ the “refs/got/backup/histedit” reference namespace.
+ <p class="Pp">Display the author, date, and log message of each backed
+ up commit, the object ID of the corresponding post-histedit commit,
+ and the object ID of their common ancestor commit. Given these
+ object IDs, the <code class="Cm">got log</code> command with the
+ <code class="Fl">-c</code> and <code class="Fl">-x</code> options
+ can be used to examine the history of either version of the branch,
+ and the <code class="Cm">got branch</code> command with the
+ <code class="Fl">-c</code> option can be used to create a new branch
+ from a pre-histedit state if desired.</p>
+ <p class="Pp">If a <var class="Ar">branch</var> is specified, only show
+ commits which at some point in time represented this branch.
+ Otherwise, list all backed up commits for any branches.</p>
+ <p class="Pp">If this option is used, <code class="Cm">got
+ histedit</code> does not require a work tree. None of the other
+ options can be used together with <code class="Fl">-l</code>.</p>
+ </dd>
</dl>
</dd>
<dt id="he"><a class="permalink" href="#he"><code class="Cm">he</code></a></dt>
<p class="Pp">The options for <code class="Cm">got stage</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="l~7"><a class="permalink" href="#l~7"><code class="Fl">-l</code></a></dt>
+ <dt id="l~9"><a class="permalink" href="#l~9"><code class="Fl">-l</code></a></dt>
<dd>Instead of staging new changes, list paths which are already staged,
along with the IDs of staged blob objects and stage status codes. If
paths were provided in the command line show the staged paths among
individual patches derived from the modified file content can be
staged. Files in added or deleted status may only be staged or
rejected in their entirety.</dd>
- <dt id="F~3"><a class="permalink" href="#F~3"><code class="Fl">-F</code></a>
+ <dt id="F~4"><a class="permalink" href="#F~4"><code class="Fl">-F</code></a>
<var class="Ar">response-script</var></dt>
<dd>With the <code class="Fl">-p</code> option, read “y”,
“n”, and “q” responses line-by-line from
If a file is staged in modified status, individual patches derived
from the staged file content can be unstaged. Files staged in added or
deleted status may only be unstaged in their entirety.</dd>
- <dt id="F~4"><a class="permalink" href="#F~4"><code class="Fl">-F</code></a>
+ <dt id="F~5"><a class="permalink" href="#F~5"><code class="Fl">-F</code></a>
<var class="Ar">response-script</var></dt>
<dd>With the <code class="Fl">-p</code> option, read “y”,
“n”, and “q” responses line-by-line from
called “unified-buffer-cache” which is forked off the
“master” branch:</p>
<p class="Pp"></p>
-<div class="Bd Bd-indent"><code class="Li">$ got branch unified-buffer-cache
- master</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got branch -c master
+ unified-buffer-cache</code></div>
<p class="Pp">Switch an existing work tree to the branch
“unified-buffer-cache”. Local changes in the work tree will be
preserved and merged if necessary:</p>
cache'</code></div>
<p class="Pp">Alternatively, create a new commit from local changes in a work
tree directory with a log message that has been prepared in the file
- <span class="Pa">/tmp/msg</span>. If <a class="Xr">vi(1)</a> is set as the
- <code class="Ev">EDITOR</code>, <span class="Pa">/tmp/msg</span> can be read
- into the buffer for review:</p>
+ <span class="Pa">/tmp/msg:</span></p>
<p class="Pp"></p>
-<div class="Bd Bd-indent"><code class="Li">$ got commit</code></div>
-<div class="Bd Bd-indent"><code class="Li">:r /tmp/msg</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got commit -F /tmp/msg</code></div>
<p class="Pp">Update any work tree checked out from the
“unified-buffer-cache” branch to the latest commit on this
branch:</p>
</div>
<table class="foot">
<tr>
- <td class="foot-date">December 27, 2020</td>
+ <td class="foot-date">March 22, 2021</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - 0f696ca9452e5e67f5f57d4a7e41a51aba4603aa
blob + 7d265ba8051f731f658df1b62b1085a3633a3e44
--- gotweb.8.html
+++ gotweb.8.html
appropriate configuration file sample.</li>
<li>httpd(8) and slowcgi(8) must be enabled and started:
<div class="Bd Pp Bd-indent">
- <pre> # rcctl enable httpd slowcgi
- # rcctl start httpd slowcgi</pre>
+ <pre>
+ # rcctl enable httpd slowcgi
+ # rcctl start httpd slowcgi
+ </pre>
</div>
</li>
<li>Optionally, the run-time behaviour of <code class="Nm">gotweb</code> can
<p class="Pp">Example configuration for httpd.conf:</p>
<div class="Bd Pp Bd-indent">
<pre>
+
types { include "/usr/share/misc/mime.types" }
server "gotweb.example.com" {
listen on * port 80
location "/*" {
directory index "index.html"
}
- }</pre>
+ }
+</pre>
</div>
</section>
<section class="Sh">
</div>
<table class="foot">
<tr>
- <td class="foot-date">December 27, 2020</td>
+ <td class="foot-date">March 22, 2021</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - 3f8c654a285aaf2baedb57e6e61451157dd22fa1
blob + 14c5cbb015affdcc9e4ff834f62a57cfc0b93f50
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
in the repository. <a class="Xr">gotweb(8)</a> will parse owner
information from either a [gotweb] or a [gitweb] section. For example:
<div class="Bd Pp Bd-indent">
- <pre>[gotweb]
-owner = "Your Name"</pre>
+ <pre>
+[gotweb]
+owner = "Your Name"
+ </pre>
</div>
</dd>
<dt id="got_site_link"><a class="permalink" href="#got_site_link"><code class="Ic">got_site_link</code></a>
<a class="Xr">gotweb(8)</a> with their default values.</p>
<div class="Bd Pp Bd-indent">
<pre>
+
#
# gotweb options
# all paths relative to /var/www (httpd chroot jail)
#got_show_repo_owner off
#got_show_repo_age false
#got_show_repo_description no
-#got_show_repo_cloneurl off</pre>
+#got_show_repo_cloneurl off
+</pre>
</div>
</section>
<section class="Sh">
</div>
<table class="foot">
<tr>
- <td class="foot-date">December 27, 2020</td>
+ <td class="foot-date">March 22, 2021</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
blob - 3fe41f730cf6b664fbeeef2c5a2865c37ee0220e
blob + 69c0ebe823564fd1126a0c7bc7132ba8c12572d2
--- tog.1.html
+++ tog.1.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">December 27, 2020</td>
+ <td class="foot-date">March 22, 2021</td>
<td class="foot-os">OpenBSD 6.8</td>
</tr>
</table>
