commit - 42a18bd6073a452f9f9854b14a4060fa6ebbb89d
commit + 41ae98c905c4378d82f873038625b205a82a4557
blob - b6d0cf4648fc1e67cdca00d64694b09da7b9625a
blob + bd50835d18f682e633d6c7ce501ef60173299b56
--- git-repository.5.html
+++ git-repository.5.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 72cf8a4a1bd5fc5f35da05345e24409e03490f39
blob + 6f543586d86863a3d61c9c4ee8c80e21930538c7
--- gitwrapper.1.html
+++ gitwrapper.1.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 97b3ea57944ec573ebe4bf7f77abc9b9a312dcb4
blob + 82fa9fe4e80023c45c460b8314d7b5a35f4b0fe3
--- got-worktree.5.html
+++ got-worktree.5.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 342e86623f36b3e08ab4a10123c629117d0b8656
blob + d75d3ef41ad1b440db0637ed00d9cc850edc0854
--- got.1.html
+++ got.1.html
<dd>Schedule unversioned files in a work tree for addition to the repository
in the next commit. By default, files which match a <code class="Cm">got
status</code> ignore pattern will not be added.
+ <p class="Pp">If a <var class="Ar">path</var> mentioned in the command line
+ is not an unversioned file then <code class="Cm">got add</code> may
+ raise an error. To avoid unnecessary errors from paths picked up by file
+ globbing patterns in the shell, paths in the argument list will be
+ silently ignored if they are not reported by <code class="Cm">got
+ status</code> at all, or if they are reported with one of the following
+ status codes and do not have changes staged via <code class="Cm">got
+ stage</code>:</p>
+ <table class="Bl-column">
+ <tr>
+ <td>M</td>
+ <td>modified file</td>
+ </tr>
+ <tr>
+ <td>A</td>
+ <td>file scheduled for addition in next commit</td>
+ </tr>
+ <tr>
+ <td>C</td>
+ <td>modified or added file which contains merge conflicts</td>
+ </tr>
+ <tr>
+ <td>m</td>
+ <td>modified file modes (executable bit only)</td>
+ </tr>
+ </table>
<p class="Pp">The options for <code class="Cm">got add</code> are as
follows:</p>
<dl class="Bl-tag">
<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
- 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
- linear projects may require merge commits in order to merge in new
- versions of third-party code stored on vendor branches created with
- <code class="Cm">got import</code>.
+ Merge the specified <var class="Ar">branch</var> into the current branch of
+ the work tree. If the branches have diverged, creates a merge commit.
+ Otherwise, if <var class="Ar">branch</var> already includes all commits
+ from the work tree's branch, updates the work tree's branch to be the same
+ as <var class="Ar">branch</var> without creating a commit, and updates the
+ work tree to the most recent commit on the branch.
+ <p class="Pp">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 linear
+ projects may require merge commits in order to merge in new versions of
+ third-party code stored on vendor branches created with
+ <code class="Cm">got import</code>.</p>
<p class="Pp">Merge commits are commits based on multiple parent commits.
- The tip commit of the work tree's current branch, which must be set with
+ The tip commit of the work tree's current branch, which must be in the
+ “refs/heads/” reference namespace and must be set with
<code class="Cm">got update -b</code> before starting the
<code class="Cm">merge</code> operation, will be used as the first
parent. The tip commit of the specified <var class="Ar">branch</var>
considered complete. Alternatively, the merge operation may be aborted
which will leave the work tree's current branch unmodified.</p>
<p class="Pp"><code class="Cm">got merge</code> will refuse to run if
- certain preconditions are not met. If history of the
- <var class="Ar">branch</var> is based on the work tree's current branch,
- then no merge commit can be created and <code class="Cm">got
- integrate</code> may be used to integrate the
- <var class="Ar">branch</var> instead. If the work tree is not yet fully
- updated to the tip commit of its branch, then the work tree must first
- be updated with <code class="Cm">got update</code>. If the work tree
- contains multiple base commits, it must first be updated to a single
- base commit with <code class="Cm">got update</code>. If changes have
- been staged with <code class="Cm">got stage</code>, these changes must
- first be committed with <code class="Cm">got commit</code> or unstaged
- with <code class="Cm">got unstage</code>. If the work tree contains
- local changes, these changes must first be committed with
- <code class="Cm">got commit</code> or reverted with <code class="Cm">got
- revert</code>. If the <var class="Ar">branch</var> contains changes to
- files outside of the work tree's path prefix, the work tree cannot be
- used to merge this branch.</p>
+ certain preconditions are not met. If the work tree's current branch is
+ not in the “refs/heads/” reference namespace then the work
+ tree must first be switched to a branch in the
+ “refs/heads/” namespace with <code class="Cm">got update
+ -b</code>. If the work tree is not yet fully updated to the tip commit
+ of its branch, then the work tree must first be updated with
+ <code class="Cm">got update</code>. If the work tree contains multiple
+ base commits, it must first be updated to a single base commit with
+ <code class="Cm">got update</code>. If changes have been staged with
+ <code class="Cm">got stage</code>, these changes must first be committed
+ with <code class="Cm">got commit</code> or unstaged with
+ <code class="Cm">got unstage</code>. If the work tree contains local
+ changes, these changes must first be committed with <code class="Cm">got
+ commit</code> or reverted with <code class="Cm">got revert</code>. If
+ the <var class="Ar">branch</var> contains changes to files outside of
+ the work tree's path prefix, the work tree cannot be used to merge this
+ branch.</p>
<p class="Pp">The <code class="Cm">got update</code>, <code class="Cm">got
commit</code>, <code class="Cm">got rebase</code>, <code class="Cm">got
histedit</code>, <code class="Cm">got integrate</code>, and
<div class="Bd Bd-indent"><code class="Li">$ set -A complete_got_1 -- $(got -h
2>&1 | sed -n s/commands://p)</code></div>
<p class="Pp">Clone an existing Git repository for use with
- <code class="Nm">got</code>.</p>
+ <code class="Nm">got</code>:</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">$ got clone
ssh://git@github.com/openbsd/src.git</code></div>
+<p class="Pp">Unfortunately, many of the popular Git hosting sites do not offer
+ anonymous access via SSH. Such sites will require an account to be created,
+ and a public SSH key to be uploaded to this account, before repository
+ access via ssh:// URLs will work.</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>
such as “origin/master” instead of
“refs/remotes/origin/master”. The latter is only needed in
case of ambiguity.</p>
-<p class="Pp"><code class="Cm">got rebase</code> must be used to merge changes
+<p class="Pp"><code class="Cm">got rebase</code> can be used to merge changes
which are visible on the “origin/master” branch into the
“master” branch. This will also merge local changes, if any,
with the incoming changes:</p>
<div class="Bd Bd-indent"><code class="Li">$ got rebase master</code></div>
<p class="Pp">In order to make changes committed to the
“unified-buffer-cache” visible on the “master”
- branch, the “unified-buffer-cache” branch must first be
- rebased onto the “master” branch:</p>
+ branch, the “unified-buffer-cache” branch can be rebased onto
+ the “master” branch:</p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ got update -b master</code></div>
<div class="Bd Bd-indent"><code class="Li">$ got rebase
<div class="Bd Bd-indent"><code class="Li">$ got update -b
upstream/master</code></div>
<div class="Bd Bd-indent"><code class="Li">$ got rebase master</code></div>
+<p class="Pp">As an alternative to <code class="Cm">got rebase</code>, branches
+ can be merged with <code class="Cm">got merge</code>:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got update -b master</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got merge
+ upstream/master</code></div>
+<p class="Pp">The question of whether to rebase or merge branches is
+ philosophical. When in doubt, refer to the software project's policies set
+ by project maintainers.</p>
<p class="Pp">As a final step, the forked repository's copy of the master branch
needs to be kept in sync by sending the new changes there:</p>
<p class="Pp"></p>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - fe9ed11ac3d549da76cb5c7642587fa547b585cf
blob + 18f5799c47715bf0500bcd0d513d0e0e7575dee2
--- got.conf.5.html
+++ got.conf.5.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 4a23d059f92a414037f51b32a86661ddef8d7228
blob + e8c2feee46a573054f6eff617563bdcd04a53a91
--- gotadmin.1.html
+++ gotadmin.1.html
<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.
+ Purge unreferenced loose objects and redundant pack files 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>
+ namespace. Objects will usually become unreferenced as a result of
+ deleting branches, tags, or other references with <code class="Cm">got
+ branch -d</code>, <code class="Cm">got ref -d</code>, or
+ <code class="Cm">got fetch -X</code>.</p>
<p class="Pp">Loose objects are stored as individual files beneath the
repository's <span class="Pa">objects/</span> directory, spread across
256 sub-directories named after the 256 possible hexadecimal values of
the first byte of an object identifier.</p>
- <p class="Pp">Packed objects stored in pack files under
- <span class="Pa">objects/pack/</span> will not be purged. However, if
- redundant copies of packed objects exist in loose form, such redundant
- copies will be purged.</p>
- <p class="Pp">Objects will usually become unreferenced as a result of
- deleting branches or tags with <code class="Cm">got branch -d</code> or
- <code class="Cm">got tag -d</code>. Deleting arbitrary references with
- <code class="Cm">got ref -d</code> may also leave unreferenced objects
- behind.</p>
- <p class="Pp">In order to determine the set of objects which are referenced,
- search all references for commit objects and tag objects, and traverse
- the corresponding tree object hierarchies. Any loose object IDs not
- encountered during this search are unreferenced and thus subject to
- removal. Display the number of commits which have been searched to
- indicate progress.</p>
+ <p class="Pp">Packed objects are stored in pack files under
+ <span class="Pa">objects/pack/</span>.</p>
+ <p class="Pp">If redundant copies of packed objects exist in loose form,
+ such redundant copies will be purged. If all the objects of a pack file
+ are present in other pack files, the redundant pack file will be purged.
+ Pack files will usually become redundant as a result of repacking the
+ repository with <code class="Nm">gotadmin</code>
+ <code class="Cm">pack</code> <code class="Fl">-a</code>.</p>
<p class="Pp">References in the <span class="Pa">refs/got</span> namespace
may prevent objects from being purged. This includes references in the
<span class="Pa">refs/got/worktree</span> namespace created by
<code class="Cm">got rebase</code> and <code class="Cm">got
histedit</code>. <code class="Cm">gotadmin cleanup</code> will only
purge corresponding objects once such references have been deleted with
- <code class="Cm">got ref -d</code>.</p>
+ <code class="Cm">got rebase -X</code>, <code class="Cm">got histedit
+ -X</code>, or <code class="Cm">got ref -d</code>.</p>
+ <p class="Pp">The “preciousObjects” Git extension is intended
+ to prevent the removal of objects from a repository.
+ <code class="Cm">gotadmin cleanup</code> will refuse to operate on
+ repositories where this extension is active.</p>
+ <p class="Pp">For compatibility with Git, if a file with the extension
+ <span class="Pa">.keep</span> exists and corresponds to a pack file with
+ the extension <span class="Pa">.pack</span> then this pack file will not
+ be removed.</p>
<p class="Pp">Some Git repositories contain pack index files which lack a
corresponding pack file, which is an inconsistent repository state. In
such cases, <code class="Cm">gotadmin cleanup -p -n</code> will display
files should be restored. If restoring missing pack files is not
possible, then affected pack index files can be removed with
<code class="Cm">gotadmin cleanup -p</code>.</p>
- <p class="Pp">The “preciousObjects” Git extension is intended
- to prevent the removal of objects from a repository.
- <code class="Cm">gotadmin cleanup</code> will refuse to operate on
- repositories where this extension is active.</p>
<p class="Pp">The options for <code class="Cm">gotadmin cleanup</code> are
as follows:</p>
<dl class="Bl-tag">
<dd>Display the usual progress output and summary information but do not
actually remove any files from disk.</dd>
<dt id="p"><a class="permalink" href="#p"><code class="Fl">-p</code></a></dt>
- <dd>Instead of purging unreferenced loose objects, remove any pack index
- files which do not have a corresponding pack file.</dd>
+ <dd>Instead of purging unreferenced loose objects and redundant pack
+ files, remove any pack index files which do not have a corresponding
+ pack file.</dd>
<dt id="q~2"><a class="permalink" href="#q~2"><code class="Fl">-q</code></a></dt>
<dd>Suppress progress reporting and disk space summary output.</dd>
<dt id="r~3"><a class="permalink" href="#r~3"><code class="Fl">-r</code></a>
<span class="An">Klemens Nanni</span>
<<a class="Mt" href="mailto:kn@openbsd.org">kn@openbsd.org</a>>
<br/>
+ <span class="An">Omar Polo</span>
+ <<a class="Mt" href="mailto:op@openbsd.org">op@openbsd.org</a>>
+ <br/>
<span class="An">Ori Bernstein</span>
<<a class="Mt" href="mailto:ori@openbsd.org">ori@openbsd.org</a>>
<br/>
<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" 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" aria-label="git-fast-export, section
1">git-fast-export(1)</a>.</li>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 98de60daf70bf0211eb4de815c8b4321bd332a90
blob + 386bcae5223b2c4e38cdd35073dd99fe79fe0959
--- gotctl.8.html
+++ gotctl.8.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 5aaa06085e17dd09aa007e2cdf30023b1eabc8e1
blob + 30ea1b068c76d54e664ee5678f7ead409cd91e8f
--- gotd.8.html
+++ gotd.8.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - dbf9aefdb261a35c90eca8455e5c8d85758d92cc
blob + a645cfc8de6c6b8eb9b060ef8e0d2667ed010f29
--- gotd.conf.5.html
+++ gotd.conf.5.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 36aa914f9c1a4bbf3c0770c144ffb4a21a5bfa2f
blob + e29c65e8b8e2442fbac4f47da912dde7a603221a
--- gotsh.1.html
+++ gotsh.1.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 0c1b3caff6536ed2dffeb20588bcd46dadceff3e
blob + ca0b468af6bd8a398dc898a3aad3d0c5d272e86e
--- gotwebd.8.html
+++ gotwebd.8.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - bfe75ff9ff6ad4959a8740ba9b446b543d495ca6
blob + 5024fa55df74189c4bfe7106bab969a59ac4b963
--- gotwebd.conf.5.html
+++ gotwebd.conf.5.html
directives inside curly braces:</p>
<p class="Pp"><code class="Ic">server</code> <var class="Ar">name</var>
{...}</p>
-<p class="Pp"><a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a> is
- compatible with TLS Server Name Indication (SNI), provided the
- <var class="Ar">name</var> of a server defined in
- <code class="Nm">gotwebd.conf</code> corresponds to the name of a server
- defined in <a class="Xr" aria-label="httpd.conf, section
- 5">httpd.conf(5)</a>.</p>
+<p class="Pp">The first server defined is used if the requested hostname is not
+ matched by any server block.</p>
<p class="Pp">The available server configuration directives are as follows:</p>
<dl class="Bl-tag">
<dt id="custom_css"><a class="permalink" href="#custom_css"><code class="Ic">custom_css</code></a>
#show_site_owner on
#show_repo_owner on
#show_repo_age on
- #show_repo_description no
+ #show_repo_description on
#show_repo_cloneurl on
#respect_exportok off
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 068965577ee8549bba8ede7461d52eeeb9608f6a
blob + bd1e3d21966e0f24888c4a18072d964f75abe455
--- tog.1.html
+++ tog.1.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">April 20,
+ line"><span class="foot-left"></span><span class="foot-date">June 23,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
