commit - 175238345207734e101987bb4ea93da851398694
commit + b078d5c4c0672adb3c9c00df78924f27ad0faf16
blob - 30fe9d230440b31cf7069ecbce08bdbc36471c06
blob + cf188c6c5b1a0bd9364616b8ccbcff8f440ae4f4
--- git-repository.5.html
+++ git-repository.5.html
<p class="Pp">A reference associates a name with an object ID. A prominent use
of references is providing names to branches in the repository by pointing
at commit objects which represent the current tip commit of a branch.
- Because references may point to arbitrary object IDs their use is not
+ Because references may point to arbitrary object IDs, their use is not
limited to branches.</p>
<p class="Pp">The name is a UTF-8 string with the following disallowed
characters: ‘ ’ (space), ~ (tilde), ^ (caret), :
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 23, 2021</td>
+ <td class="foot-date">March 23, 2022</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - f48e9d886be4a6d54c86f12344fc56bc00bfc4f3
blob + ac5033a2f55810657d78797d1095a899426ff2bc
--- got-worktree.5.html
+++ got-worktree.5.html
the current base commit in the Git repository. The presence of this
reference prevents the Git garbage collector and <code class="Cm">gotadmin
cleanup</code> from discarding the base commit and any objects it refers to.
- When a work tree is no longer needed its reference can be deleted from the
+ When a work tree is no longer needed, its reference can be deleted from the
Git repository with <code class="Cm">got ref -d</code>.</p>
</section>
<section class="Sh">
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 23, 2021</td>
+ <td class="foot-date">March 23, 2022</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - f43159ebbbea6be87a33ddd6175bbbfcbace6e31
blob + e131e3561f8776532def2203c460cd21688b31d1
--- got.1.html
+++ got.1.html
<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
+ <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.
branches in the “refs/heads/” namespace, merging incoming
changes with the changes on those branches as necessary.</p>
<p class="Pp">If the repository was created as a mirror with
- <code class="Cm">got clone -m</code> then all branches in the
+ <code class="Cm">got clone -m</code>, then all branches in the
“refs/heads/” namespace will be updated directly to match
the corresponding branches in the remote repository. If those branches
contained local commits, these commits will no longer be reachable via a
<p class="Pp">If the specified <var class="Ar">commit</var> is not
contained in the selected branch, a different branch which contains
this commit must be specified with the <code class="Fl">-b</code>
- option. If no such branch is known a new branch must be created for
+ option. If no such branch is known, a new branch must be created for
this commit with <code class="Cm">got branch</code> before
<code class="Cm">got checkout</code> can be used. Checking out work
trees with an unknown branch is intentionally not supported.</p>
<p class="Pp">Files which already contain merge conflicts will not be
updated to avoid further complications. Such files will be updated when
<code class="Cm">got update</code> is run again after merge conflicts
- have been resolved. If the conflicting changes are no longer needed
+ have been resolved. If the conflicting changes are no longer needed,
affected files can be reverted with <code class="Cm">got revert</code>
before running <code class="Cm">got update</code> again.</p>
<p class="Pp">Show the status of each affected file, using the following
<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
- used together with <code class="Fl">-P</code> then the file paths
+ used together with <code class="Fl">-P</code>, then the file paths
changed by a commit can be matched as well. Regular expression syntax
is documented in <a class="Xr">re_format(7)</a>.</dd>
<dt id="r~3"><a class="permalink" href="#r~3"><code class="Fl">-r</code></a>
<dt id="br"><a class="permalink" href="#branch"><code class="Cm" id="branch">branch</code></a>
[<code class="Fl">-c</code> <var class="Ar">commit</var>]
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
- [<code class="Fl">-l</code>] [<code class="Fl">-d</code>
- <var class="Ar">name</var>] [<code class="Fl">-n</code>]
- [<var class="Ar">name</var>]</dt>
+ [<code class="Fl">-l</code>] [<code class="Fl">-t</code>]
+ [<code class="Fl">-d</code> <var class="Ar">name</var>]
+ [<code class="Fl">-n</code>] [<var class="Ar">name</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">br</code>)</code></div>
“refs/heads/” reference namespace. The
<code class="Cm">got branch</code> command creates references in this
namespace only.</p>
- <p class="Pp">When deleting branches the specified
+ <p class="Pp">When deleting branches, the specified
<var class="Ar">name</var> is searched in the “refs/heads”
- reference namespace first. If no corresponding branch is found the
+ reference namespace first. If no corresponding branch is found, the
“refs/remotes” namespace will be searched next.</p>
<p class="Pp">If invoked in a work tree without any arguments, print the
name of the work tree's current branch.</p>
follows:</p>
<dl class="Bl-tag">
<dt id="f"><a class="permalink" href="#f"><code class="Fl">-f</code></a></dt>
- <dd>Perform the operation even if a file contains local
- modifications.</dd>
+ <dd>Perform the operation even if a file contains local modifications, and
+ do not raise an error if a specified <var class="Ar">path</var> does
+ not exist on disk.</dd>
<dt id="k"><a class="permalink" href="#k"><code class="Fl">-k</code></a></dt>
<dd>Keep affected files on disk.</dd>
<dt id="R~6"><a class="permalink" href="#R~6"><code class="Fl">-R</code></a></dt>
</tr>
</table>
</dd>
+ </dl>
+ </dd>
+ <dt id="pa"><a class="permalink" href="#patch"><code class="Cm" id="patch">patch</code></a>
+ [<code class="Fl">-n</code>] [<var class="Ar">patchfile</var>]</dt>
+ <dd>
+ <div class="Bd Bd-indent"><code class="Li">(alias:
+ <code class="Cm">pa</code>)</code></div>
+ Apply changes from <var class="Ar">patchfile</var> to files in a work tree.
+ 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>
+ <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
+ status codes:</p>
+ <table class="Bl-column">
+ <tr>
+ <td>M</td>
+ <td>file was modified</td>
+ </tr>
+ <tr>
+ <td>D</td>
+ <td>file was deleted</td>
+ </tr>
+ <tr>
+ <td>A</td>
+ <td>file was added</td>
+ </tr>
+ <tr>
+ <td>#</td>
+ <td>failed to patch the file</td>
+ </tr>
+ </table>
+ <p class="Pp">If a change does not match at its exact line number, attempt
+ to apply it somewhere else in the file if a good spot can be found.
+ Otherwise, the patch will fail to apply.</p>
+ <p class="Pp"><code class="Nm">got</code> <code class="Cm">patch</code> will
+ refuse to apply a patch if certain preconditions are not met. Files to
+ be deleted must already be under version control, and must not have been
+ scheduled for deletion already. Files to be added must not yet be under
+ version control and must not already be present on disk. Files to be
+ modified must already be under version control and may not contain
+ conflict markers.</p>
+ <p class="Pp">If an error occurs, the <code class="Cm">patch</code>
+ operation will be aborted. Any changes made to the work tree up to this
+ point will be left behind. Such changes can be viewed with
+ <code class="Cm">got diff</code> and can be reverted with
+ <code class="Cm">got revert</code> if needed.</p>
+ <p class="Pp">The options for <code class="Cm">got patch</code> are as
+ follows:</p>
+ <dl class="Bl-tag">
+ <dt id="n~2"><a class="permalink" href="#n~2"><code class="Fl">-n</code></a></dt>
+ <dd>Do not make any modifications to the work tree. This can be used to
+ check whether a patch would apply without issues. If the
+ <var class="Ar">patchfile</var> contains diffs that affect the same
+ file multiple times, the results displayed may be incorrect.</dd>
</dl>
</dd>
<dt id="rv"><a class="permalink" href="#revert"><code class="Cm" id="revert">revert</code></a>
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>!
- <p class="Pp">If a file was added with <code class="Cm">got add</code> it
+ <p class="Pp">If a file was added with <code class="Cm">got add</code>, it
will become an unversioned file again. If a file was deleted with
- <code class="Cm">got remove</code> it will be restored.</p>
+ <code class="Cm">got remove</code>, it will be restored.</p>
<p class="Pp">The options for <code class="Cm">got revert</code> are as
follows:</p>
<dl class="Bl-tag">
discarded again with <code class="Cm">got revert</code>.</p>
<p class="Pp"><code class="Cm">got cherrypick</code> will refuse to run if
certain preconditions are not met. If the work tree contains multiple
- base commits it must first be updated to a single base commit with
+ base commits, it must first be updated to a single base commit with
<code class="Cm">got update</code>. If any relevant files already
contain merge conflicts, these conflicts must be resolved first.</p>
</dd>
discarded again with <code class="Cm">got revert</code>.</p>
<p class="Pp"><code class="Cm">got backout</code> will refuse to run if
certain preconditions are not met. If the work tree contains multiple
- base commits it must first be updated to a single base commit with
+ base commits, it must first be updated to a single base commit with
<code class="Cm">got update</code>. If any relevant files already
contain merge conflicts, these conflicts must be resolved first.</p>
</dd>
<td>changes destined for an unversioned file were not merged</td>
</tr>
</table>
- <p class="Pp">If merge conflicts occur the rebase operation is interrupted
+ <p class="Pp">If merge conflicts occur, the rebase operation is interrupted
and may be continued once conflicts have been resolved. If any files
with destined changes are found to be missing or unversioned, or if
files could not be deleted due to differences in deleted content, the
elided when the rebase operation continues.</p>
<p class="Pp"><code class="Cm">got rebase</code> will refuse to run if
certain preconditions are not met. 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 changes have been
+ updated to the tip commit of its branch, then the work tree must first
+ be updated 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
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>
+ 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="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
+ <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
branch is already the current branch of the work tree. The tip of this
<td>changes destined for an unversioned file were not merged</td>
</tr>
</table>
- <p class="Pp">If merge conflicts occur the histedit operation is interrupted
- and may be continued once conflicts have been resolved. If any files
- with destined changes are found to be missing or unversioned, or if
- files could not be deleted due to differences in deleted content, the
- histedit operation will be interrupted to prevent potentially incomplete
- changes from being committed to the repository without user
+ <p class="Pp">If merge conflicts occur, the histedit operation is
+ interrupted and may be continued once conflicts have been resolved. If
+ any files with destined changes are found to be missing or unversioned,
+ or if files could not be deleted due to differences in deleted content,
+ the histedit operation will be interrupted to prevent potentially
+ incomplete changes from being committed to the repository without user
intervention. The work tree may be modified as desired and the histedit
operation can be continued once the changes present in the work tree are
considered complete. Alternatively, the histedit operation may be
certain preconditions are not met. If the work tree's current branch is
not in the “refs/heads/” reference namespace, the history
of the branch may not be edited. If the work tree contains multiple base
- commits it must first be updated to a single base commit with
+ 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
<var class="Ar">branch</var> must have been rebased onto the work tree's
current branch with <code class="Cm">got rebase</code> before it can be
integrated, in order to linearize commit history and resolve merge
- conflicts. If the work tree contains multiple base commits it must first
- be updated to a single base commit with <code class="Cm">got
+ conflicts. 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
<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>
+ 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
<dt id="c~12"><a class="permalink" href="#c~12"><code class="Fl">-c</code></a></dt>
<dd>Continue an interrupted merge operation. If this option is used, no
other command-line arguments are allowed.</dd>
- <dt id="n~2"><a class="permalink" href="#n~2"><code class="Fl">-n</code></a></dt>
+ <dt id="n~3"><a class="permalink" href="#n~3"><code class="Fl">-n</code></a></dt>
<dd>Merge changes into the work tree as usual but do not create a merge
commit immediately. The merge result can be adjusted as desired before
a merge commit is created with <code class="Cm">got merge -c</code>.
<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
+ paths were provided on the command line, show the staged paths among
the specified paths. Otherwise, show all staged paths.</dd>
<dt id="p~4"><a class="permalink" href="#p~4"><code class="Fl">-p</code></a></dt>
<dd>Instead of staging the entire content of a changed file, interactively
<p class="Pp">Changes on the “unified-buffer-cache” branch can now
be made visible on the “master” branch with
<code class="Cm">got integrate</code>. Because the rebase operation switched
- the work tree to the “unified-buffer-cache” branch the work
+ the work tree to the “unified-buffer-cache” branch, the work
tree must be switched back to the “master” branch first:</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 update -c
origin/master</code></div>
<div class="Bd Bd-indent"><code class="Li">$ got histedit -m</code></div>
-<p class="Pp">If the remote repository offers write access local changes on the
+<p class="Pp">If the remote repository offers write access, local changes on the
“master” branch can be sent to the remote repository with
<code class="Cm">got send</code>. Usually, <code class="Cm">got send</code>
can be run without further arguments. The arguments shown here match
<p class="Pp"></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
+<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>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ cd /var/git/src.git</code></div>
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 23, 2021</td>
+ <td class="foot-date">March 23, 2022</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - d4f8efa1e3d6ac22a279ed5823b7f206a7ef9cb4
blob + 698ff9a23ac68665952a0716ce777bdd95a8c2d2
--- got.conf.5.html
+++ got.conf.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 23, 2021</td>
+ <td class="foot-date">March 23, 2022</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 22e105c0e96b8f0fa0c3fd1d4b508337c7722d0d
blob + 89873b032a7bc0a00e1c61cbf2311fdde52163d6
--- gotadmin.1.html
+++ gotadmin.1.html
<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>
- <p class="Pp">If a packed object is deltified against another object the
+ <p class="Pp">If a packed object is deltified against another object, the
delta base will be shown as well. For offset deltas, the delta base is
identified via an offset into the pack file. For reference deltas, the
delta base is identified via an object ID.</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>.</p>
+ the repository and should end in <span class="Pa">.pack</span>. The
+ corresponding pack index must exist and can be created with
+ <code class="Cm">gotadmin indexpack</code> if it is missing.</p>
<p class="Pp">The options for <code class="Cm">gotadmin listpack</code> are
as follows:</p>
<dl class="Bl-tag">
<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
- a list of affected pack index files. Whenever possible the missing pack
+ a list of affected pack index files. Whenever possible, the missing pack
files should be restored. If restoring missing pack files is not
- possible then affected pack index files can be removed with
+ 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.
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 23, 2021</td>
+ <td class="foot-date">March 23, 2022</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 9e3dd092ffa0f492a71c162a6a2f358b44eaa6ab
blob + 85bce51f83663e019192f508845f9313ef1bb7d5
--- gotweb.8.html
+++ gotweb.8.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 23, 2021</td>
+ <td class="foot-date">March 23, 2022</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 64f0e6603fdb1b079894be0a5d5f2b0dbffe2878
blob + ed26b14133cfc35673bec760d3e0b72963460930
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 23, 2021</td>
+ <td class="foot-date">March 23, 2022</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 005d0431bcaa7b19588756420dbb232fb0df9ada
blob + 2e5f5b12e2bfa0dbbc3921e9f18428362894d5e8
--- tog.1.html
+++ tog.1.html
G</code></a></dt>
<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
+ 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>
<dd>The color used to mark up references in the “refs/remotes/”
namespace. If not set, the default value “yellow” is
used.</dd>
+ <dt id="TOG_COLOR_REFS_BACKUP"><a class="permalink" href="#TOG_COLOR_REFS_BACKUP"><code class="Ev">TOG_COLOR_REFS_BACKUP</code></a></dt>
+ <dd>The color used to mark up references in the
+ “refs/got/backup/” namespace. If not set, the default value
+ “cyan” is used.</dd>
</dl>
</section>
<section class="Sh">
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 23, 2021</td>
+ <td class="foot-date">March 23, 2022</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
