commit - 40547f9ee6c1b1ac8c2ec40ceb49f7f5f195d555
commit + feee69235741e6885f9ecc0c9989e4b1315e34e6
blob - 9e7456114063e04e4c24904fda765e9b4bef0055
blob + 4bdfc72033a350bf3f161da1cf3f7a5a58e94e85
--- git-repository.5.html
+++ git-repository.5.html
<dd>Git configuration file. See <a class="Xr">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>
<dt><span class="Pa">hooks/</span></dt>
<dd>This directory contains hook scripts to run when certain events
occur.</dd>
<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">deflate(3)</a>,
- <a class="Xr">SHA1(3)</a>, <a class="Xr">got-worktree(5)</a></p>
+ <a class="Xr">SHA1(3)</a>, <a class="Xr">got-worktree(5)</a>
+ <a class="Xr">got.conf(5)</a></p>
</section>
<section class="Sh">
<h1 class="Sh" id="HISTORY"><a class="permalink" href="#HISTORY">HISTORY</a></h1>
</div>
<table class="foot">
<tr>
- <td class="foot-date">August 2, 2020</td>
+ <td class="foot-date">September 17, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - 152df8aef174da28e6c4e26ea6523217d2893311
blob + 68f478cda110078638f0c290db8aef071bc282cb
--- got-worktree.5.html
+++ got-worktree.5.html
<div class="manual-text">
<section class="Sh">
<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<p class="Pp"><code class="Nm">got-worktree</code> — <span class="Nd">Got
- worktree format</span></p>
+<p class="Pp"><code class="Nm">got-worktree</code> —
+ <span class="Nd">Game of Trees work tree format</span></p>
</section>
<section class="Sh">
<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
file addition or modification has been staged with <code class="Cm">got
stage</code>.</dd>
</dl>
-<p class="Pp">A corrupt or missing file index can be recreated on demand with
- <code class="Cm">got update</code>. 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>
+<p class="Pp">A corrupt or missing file index can be recreated on demand as
+ follows:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ mv .got/file-index
+ .got/file-index.bad</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got update # re-create
+ .got/file-index</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ find . -type f -exec touch
+ {} \; # update timestamp of all files</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got update # sync
+ timestamps</code></div>
+<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>
<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>
<dd>File status information.</dd>
<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>
<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>
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></p>
+ <a class="Xr">lockf(3)</a>, <a class="Xr">git-repository(5)</a>,
+ <a class="Xr">got.conf(5)</a></p>
</section>
</div>
<table class="foot">
<tr>
- <td class="foot-date">August 2, 2020</td>
+ <td class="foot-date">September 17, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - 24baf649ba8001d178764ad3b20cab3c5b2a7c2b
blob + bc7b860845b6538f9b85d6daaea4aaf6d7b57435
--- got.1.html
+++ got.1.html
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 Git's <code class="Dv">user.name</code> and
+ 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
time. More details about the pack file format are documented in
<a class="Xr">git-repository(5)</a>.</p>
<p class="Pp"><code class="Cm">got clone</code> creates a remote repository
- entry in the <span class="Pa">config</span> file 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>
+ 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>
<p class="Pp">The options for <code class="Cm">got clone</code> are as
follows:</p>
<dl class="Bl-tag">
<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 <span class="Pa">config</span> file will
- be set up with the “mirror” option enabled, such that
+ <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>
will write incoming changes directly to branches in the
“refs/heads/” reference namespace, rather than to
<dd>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 the
- <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">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>
<dt id="up"><a class="permalink" href="#up"><code class="Cm">up</code></a></dt>
<dd>Short alias for <code class="Cm">update</code>.</dd>
<dt id="status"><a class="permalink" href="#status"><code class="Cm">status</code></a>
+ [<code class="Fl">-s</code> <var class="Ar">status-codes</var>]
[<var class="Ar">path ...</var>]</dt>
<dd>Show the current modification status of files in a work tree, using the
following status codes:
<td>file was modified after having been staged for addition</td>
</tr>
</table>
+ <p class="Pp">The options for <code class="Cm">got status</code> are as
+ follows:</p>
+ <dl class="Bl-tag">
+ <dt id="s"><a class="permalink" href="#s"><code class="Fl">-s</code></a>
+ <var class="Ar">status-codes</var></dt>
+ <dd>Only show files with a modification status matching any of the
+ single-character status codes contained in the
+ <var class="Ar">status-codes</var> argument. Any combination of codes
+ from the above list of possible status codes may be specified. For
+ staged files, status codes displayed in either column will be
+ matched.</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
</tr>
</table>
</dd>
- <dt id="s"><a class="permalink" href="#s"><code class="Fl">-s</code></a>
+ <dt id="s~2"><a class="permalink" href="#s~2"><code class="Fl">-s</code></a>
<var class="Ar">search-pattern</var></dt>
<dd>If specified, show only commits with a log message matched by the
extended regular expression <var class="Ar">search-pattern</var>. When
repository is located at or above the current working directory. If
this directory is a <code class="Nm">got</code> work tree, use the
repository path associated with this work tree.</dd>
- <dt id="s~2"><a class="permalink" href="#s~2"><code class="Fl">-s</code></a></dt>
+ <dt id="s~3"><a class="permalink" href="#s~3"><code class="Fl">-s</code></a></dt>
<dd>Show changes staged with <code class="Cm">got stage</code> instead of
showing local changes in the work tree. This option is only valid when
<code class="Cm">got diff</code> is invoked in a work tree.</dd>
corresponding commit, tree, tag, or blob object. Cannot be used
together with any other options except
<code class="Fl">-r</code>.</dd>
- <dt id="s~3"><a class="permalink" href="#s~3"><code class="Fl">-s</code></a>
+ <dt id="s~4"><a class="permalink" href="#s~4"><code class="Fl">-s</code></a>
<var class="Ar">reference</var></dt>
<dd>Create a symbolic reference, or change an existing symbolic reference.
The symbolic reference with the specified <var class="Ar">name</var>
</dd>
<dt id="remove"><a class="permalink" href="#remove"><code class="Cm">remove</code></a>
[<code class="Fl">-f</code>] [<code class="Fl">-k</code>]
- [<code class="Fl">-R</code>] <var class="Ar">path ...</var></dt>
+ [<code class="Fl">-R</code>] [<code class="Fl">-s</code>
+ <var class="Ar">status-codes</var>] <var class="Ar">path ...</var></dt>
<dd>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
<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>
+ <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
+ <var class="Ar">status-codes</var> argument. The following status
+ codes may be specified:
+ <table class="Bl-column">
+ <tr>
+ <td>M</td>
+ <td>modified file (this implies the <code class="Fl">-f</code>
+ option)</td>
+ </tr>
+ <tr>
+ <td>!</td>
+ <td>versioned file expected on disk but missing</td>
+ </tr>
+ </table>
+ </dd>
</dl>
</dd>
<dt id="rm"><a class="permalink" href="#rm"><code class="Cm">rm</code></a></dt>
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 Git's <code class="Dv">user.name</code> and
+ 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
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" id="not">If present, 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 will override the
- value of <code class="Ev">GOT_AUTHOR</code>. However, the
+ <p class="Pp"><code class="Ev">GOT_AUTHOR will be overriden 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 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 be used
- only if the <code class="Ev">GOT_AUTHOR</code> environment variable is
- <a class="permalink" href="#not"><i class="Em">not</i></a> set.</p>
+ <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>
</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 import</code>, or <code class="Cm">got
- tag</code>.</dd>
+ <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>
<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>
</section>
<section class="Sh">
+<h1 class="Sh" id="FILES"><a class="permalink" href="#FILES">FILES</a></h1>
+<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.
+ <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</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>
+</dl>
+</section>
+<section class="Sh">
<h1 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
STATUS</a></h1>
<p class="Pp">The <code class="Nm">got</code> utility exits 0 on success,
/usr/src</code></div>
<p class="Pp">View local changes in a work tree directory:</p>
<p class="Pp"></p>
-<div class="Bd Bd-indent"><code class="Li">$ got status</code></div>
<div class="Bd Bd-indent"><code class="Li">$ got diff | less</code></div>
+<p class="Pp">In a work tree, display files in a potentially problematic
+ state:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got status -s 'C!~?'</code></div>
<p class="Pp">Interactively revert selected local changes in a work tree
directory:</p>
<p class="Pp"></p>
<h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
ALSO</a></h1>
<p class="Pp"><a class="Xr">tog(1)</a>, <a class="Xr">git-repository(5)</a>,
- <a class="Xr">got-worktree(5)</a></p>
+ <a class="Xr">got-worktree(5)</a>, <a class="Xr">got.conf(5)</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">August 2, 2020</td>
+ <td class="foot-date">September 17, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - 6750cb73d5ff77033f0af3f3a93d82a85988af7e
blob + 81335f04ec686531c16ba81288004f0d6bff4541
--- gotweb.8.html
+++ gotweb.8.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">August 2, 2020</td>
+ <td class="foot-date">September 17, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - b7f685334dc6665276444710655c12a80768086b
blob + d098c993eb83d2c0af4fc073de0141b430905171
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">August 2, 2020</td>
+ <td class="foot-date">September 17, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - 6043ff0f90a02b33a76e254a018a5083c6d187a2
blob + 950285ffd7156e78f6d36f9b27baf33706ccdce7
--- tog.1.html
+++ tog.1.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">August 2, 2020</td>
+ <td class="foot-date">September 17, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
