commit - 7127aa47f82ce60c3de6a0dbd3c350100ea423c0
commit + 63b698215d3827d69ecf1c8b0cb96e2b4c836c67
blob - 683d8411a544d1d56b0d5f9e3902ab95d46b5d66
blob + d018de5c553f0291e4d6402472bc37e677ea83cd
--- git-repository.5.html
+++ git-repository.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">October 3, 2021</td>
+ <td class="foot-date">October 16, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 55ab265e049976b4ad3cbdc014886408a2dcf896
blob + db2bded73faf9fbbe2520ff5089f5b977d4ec929
--- got-worktree.5.html
+++ got-worktree.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">October 3, 2021</td>
+ <td class="foot-date">October 16, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - e2e3e3fd03ceb92bdc40b93df90855e7e3fa8d06
blob + 76a74470a695e9e3d7359212e5081488001bda79
--- got.1.html
+++ got.1.html
empty repository before <code class="Cm">got checkout</code> can be
used.</p>
</dd>
- <dt id="import"><a class="permalink" href="#import"><code class="Cm">import</code></a>
+ <dt id="im"><a class="permalink" href="#import"><code class="Cm" id="import">import</code></a>
[<code class="Fl">-b</code> <var class="Ar">branch</var>]
[<code class="Fl">-m</code> <var class="Ar">message</var>]
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
[<code class="Fl">-I</code> <var class="Ar">pattern</var>]
<var class="Ar">directory</var></dt>
- <dd>Create an initial commit in a repository from the file hierarchy within
+ <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
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
<a class="Xr">glob(7)</a>.</dd>
</dl>
</dd>
- <dt id="im"><a class="permalink" href="#im"><code class="Cm">im</code></a></dt>
- <dd>Short alias for <code class="Cm">import</code>.</dd>
- <dt id="clone"><a class="permalink" href="#clone"><code class="Cm">clone</code></a>
+ <dt id="cl"><a class="permalink" href="#clone"><code class="Cm" id="clone">clone</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-b</code>
<var class="Ar">branch</var>] [<code class="Fl">-l</code>]
[<code class="Fl">-m</code>] [<code class="Fl">-q</code>]
[<code class="Fl">-v</code>] [<code class="Fl">-R</code>
<var class="Ar">reference</var>] <var class="Ar">repository-URL</var>
[<var class="Ar">directory</var>]</dt>
- <dd>Clone a Git repository at the specified
+ <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
</dd>
</dl>
</dd>
- <dt id="cl"><a class="permalink" href="#cl"><code class="Cm">cl</code></a></dt>
- <dd>Short alias for <code class="Cm">clone</code>.</dd>
- <dt id="fetch"><a class="permalink" href="#fetch"><code class="Cm">fetch</code></a>
+ <dt id="fe"><a class="permalink" href="#fetch"><code class="Cm" id="fetch">fetch</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-b</code>
<var class="Ar">branch</var>] [<code class="Fl">-d</code>]
[<code class="Fl">-l</code>] [<code class="Fl">-r</code>
[<code class="Fl">-q</code>] [<code class="Fl">-v</code>]
[<code class="Fl">-R</code> <var class="Ar">reference</var>]
[<code class="Fl">-X</code>] [<var class="Ar">remote-repository</var>]</dt>
- <dd>Fetch new changes from a remote repository. If no
+ <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
<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
</dd>
</dl>
</dd>
- <dt id="fe"><a class="permalink" href="#fe"><code class="Cm">fe</code></a></dt>
- <dd>Short alias for <code class="Cm">fetch</code>.</dd>
- <dt id="checkout"><a class="permalink" href="#checkout"><code class="Cm">checkout</code></a>
+ <dt id="co"><a class="permalink" href="#checkout"><code class="Cm" id="checkout">checkout</code></a>
[<code class="Fl">-E</code>] [<code class="Fl">-b</code>
<var class="Ar">branch</var>] [<code class="Fl">-c</code>
<var class="Ar">commit</var>] [<code class="Fl">-p</code>
<var class="Ar">path-prefix</var>] [<code class="Fl">-q</code>]
<var class="Ar">repository-path</var>
[<var class="Ar">work-tree-path</var>]</dt>
- <dd>Copy files from a repository into a new work tree. Show the status of each
+ <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
affected file, using the following status codes:
<table class="Bl-column">
<tr>
<dd>Silence progress output.</dd>
</dl>
</dd>
- <dt id="co"><a class="permalink" href="#co"><code class="Cm">co</code></a></dt>
- <dd>Short alias for <code class="Cm">checkout</code>.</dd>
- <dt id="update"><a class="permalink" href="#update"><code class="Cm">update</code></a>
+ <dt id="up"><a class="permalink" href="#update"><code class="Cm" id="update">update</code></a>
[<code class="Fl">-b</code> <var class="Ar">branch</var>]
[<code class="Fl">-c</code> <var class="Ar">commit</var>]
[<code class="Fl">-q</code>] [<var class="Ar">path ...</var>]</dt>
- <dd>Update an existing work tree to a different <var class="Ar">commit</var>.
+ <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>.
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.
<dd>Silence progress output.</dd>
</dl>
</dd>
- <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>
+ <dt id="st"><a class="permalink" href="#status"><code class="Cm" id="status">status</code></a>
[<code class="Fl">-I</code>] [<code class="Fl">-s</code>
<var class="Ar">status-codes</var>] [<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
+ <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
following status codes:
<table class="Bl-column">
<tr>
gives no special significance to the location of path component
separators, “/”, in a pattern.</p>
</dd>
- <dt id="st"><a class="permalink" href="#st"><code class="Cm">st</code></a></dt>
- <dd>Short alias for <code class="Cm">status</code>.</dd>
<dt id="log"><a class="permalink" href="#log"><code class="Cm">log</code></a>
[<code class="Fl">-b</code>] [<code class="Fl">-c</code>
<var class="Ar">commit</var>] [<code class="Fl">-C</code>
traversed.</dd>
</dl>
</dd>
- <dt id="diff"><a class="permalink" href="#diff"><code class="Cm">diff</code></a>
- [<code class="Fl">-a</code>] [<code class="Fl">-C</code>
+ <dt id="di"><a class="permalink" href="#diff"><code class="Cm" id="diff">diff</code></a>
+ [<code class="Fl">-a</code>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-C</code>
<var class="Ar">number</var>] [<code class="Fl">-r</code>
<var class="Ar">repository-path</var>] [<code class="Fl">-s</code>]
- [<code class="Fl">-w</code>] [<var class="Ar">object1</var>
- <var class="Ar">object2</var> | <var class="Ar">path</var>]</dt>
- <dd>When invoked within a work tree with less than two arguments, display
- local changes in the work tree. If a <var class="Ar">path</var> is
- specified, only show changes within this path.
+ [<code class="Fl">-P</code>] [<code class="Fl">-w</code>]
+ [<var class="Ar">object1</var> <var class="Ar">object2</var> |
+ <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
+ 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
reference, a tag name, or an object ID SHA1 hash, and display
differences between the corresponding objects. Both objects must be of
the same type (blobs, trees, or commits). An abbreviated hash argument
will be expanded to a full SHA1 hash automatically, provided the
- abbreviation is unique.</p>
+ abbreviation is unique. If none of these interpretations produce a valid
+ result or if the <code class="Fl">-P</code> option is used, and if
+ <code class="Cm">got diff</code> is running in a work tree, attempt to
+ interpret the two arguments as paths.</p>
<p class="Pp">The options for <code class="Cm">got diff</code> are as
follows:</p>
<dl class="Bl-tag">
<dt id="a~3"><a class="permalink" href="#a~3"><code class="Fl">-a</code></a></dt>
<dd>Treat file contents as ASCII text even if binary data is
detected.</dd>
+ <dt id="c~4"><a class="permalink" href="#c~4"><code class="Fl">-c</code></a>
+ <var class="Ar">commit</var></dt>
+ <dd>Show differences between commits in the repository. This options may
+ be used up to two times. When used only once, show differences between
+ the specified <var class="Ar">commit</var> and its first parent
+ commit. When used twice, show differences between the two specified
+ commits.
+ <p class="Pp">The expected argument is a commit ID SHA1 hash or an
+ existing reference or tag name which will be resolved to a commit
+ ID. An abbreviated hash argument will be expanded to a full SHA1
+ hash automatically, provided the abbreviation is unique.</p>
+ <p class="Pp">If the <code class="Fl">-c</code> option is used, all
+ non-option arguments will be interpreted as paths. If one or more
+ such <var class="Ar">path</var> arguments are provided, only show
+ differences for the specified paths.</p>
+ <p class="Pp">Cannot be used together with the
+ <code class="Fl">-P</code> option.</p>
+ </dd>
<dt id="C~2"><a class="permalink" href="#C~2"><code class="Fl">-C</code></a>
<var class="Ar">number</var></dt>
<dd>Set the number of context lines shown in the diff. By default, 3 lines
<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>
+ <dt id="P~2"><a class="permalink" href="#P~2"><code class="Fl">-P</code></a></dt>
+ <dd>Interpret all arguments as paths only. This option can be used to
+ resolve ambiguity in cases where paths look like tag names, reference
+ names, or object IDs. This option is only valid when
+ <code class="Cm">got diff</code> is invoked in a work tree.</dd>
<dt id="w"><a class="permalink" href="#w"><code class="Fl">-w</code></a></dt>
<dd>Ignore whitespace-only changes.</dd>
</dl>
</dd>
- <dt id="di"><a class="permalink" href="#di"><code class="Cm">di</code></a></dt>
- <dd>Short alias for <code class="Cm">diff</code>.</dd>
- <dt id="blame"><a class="permalink" href="#blame"><code class="Cm">blame</code></a>
+ <dt id="bl"><a class="permalink" href="#blame"><code class="Cm" id="blame">blame</code></a>
[<code class="Fl">-c</code> <var class="Ar">commit</var>]
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
<var class="Ar">path</var></dt>
- <dd>Display line-by-line history of a file at the specified path.
+ <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.
<p class="Pp">The options for <code class="Cm">got blame</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~4"><a class="permalink" href="#c~4"><code class="Fl">-c</code></a>
+ <dt id="c~5"><a class="permalink" href="#c~5"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Start traversing history at the specified
<var class="Ar">commit</var>. The expected argument is a commit ID
repository path associated with this work tree.</dd>
</dl>
</dd>
- <dt id="bl"><a class="permalink" href="#bl"><code class="Cm">bl</code></a></dt>
- <dd>Short alias for <code class="Cm">blame</code>.</dd>
- <dt id="tree"><a class="permalink" href="#tree"><code class="Cm">tree</code></a>
+ <dt id="tr"><a class="permalink" href="#tree"><code class="Cm" id="tree">tree</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">-i</code>] [<code class="Fl">-R</code>]
[<var class="Ar">path</var>]</dt>
- <dd>Display a listing of files and directories at the specified directory path
+ <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
in the repository. Entries shown in this listing may carry one of the
following trailing annotations:
<table class="Bl-column">
<p class="Pp">The options for <code class="Cm">got tree</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~5"><a class="permalink" href="#c~5"><code class="Fl">-c</code></a>
+ <dt id="c~6"><a class="permalink" href="#c~6"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>List files and directories as they appear in the specified
<var class="Ar">commit</var>. The expected argument is a commit ID
<dd>Recurse into sub-directories in the repository.</dd>
</dl>
</dd>
- <dt id="tr"><a class="permalink" href="#tr"><code class="Cm">tr</code></a></dt>
- <dd>Short alias for <code class="Cm">tree</code>.</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>
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>
- <dt id="c~6"><a class="permalink" href="#c~6"><code class="Fl">-c</code></a>
+ <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
the specified <var class="Ar">name</var> will point at the specified
<code class="Fl">-r</code>.</dd>
</dl>
</dd>
- <dt id="branch"><a class="permalink" href="#branch"><code class="Cm">branch</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>
- <dd>Create, list, or delete branches.
+ <dd>
+ <div class="Bd Bd-indent"><code class="Li">(alias:
+ <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
<p class="Pp">The options for <code class="Cm">got branch</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~7"><a class="permalink" href="#c~7"><code class="Fl">-c</code></a>
+ <dt id="c~8"><a class="permalink" href="#c~8"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Make a newly created branch reference point at the specified
<var class="Ar">commit</var>. The expected
branch.</dd>
</dl>
</dd>
- <dt id="br"><a class="permalink" href="#br"><code class="Cm">br</code></a></dt>
- <dd>Short alias for <code class="Cm">branch</code>.</dd>
<dt id="tag"><a class="permalink" href="#tag"><code class="Cm">tag</code></a>
[<code class="Fl">-c</code> <var class="Ar">commit</var>]
[<code class="Fl">-m</code> <var class="Ar">message</var>]
<p class="Pp">The options for <code class="Cm">got tag</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~8"><a class="permalink" href="#c~8"><code class="Fl">-c</code></a>
+ <dt id="c~9"><a class="permalink" href="#c~9"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Make the newly created tag reference point at the specified
<var class="Ar">commit</var>. The expected
ignore pattern.</dd>
</dl>
</dd>
- <dt id="remove"><a class="permalink" href="#remove"><code class="Cm">remove</code></a>
+ <dt id="rm"><a class="permalink" href="#remove"><code class="Cm" id="remove">remove</code></a>
[<code class="Fl">-f</code>] [<code class="Fl">-k</code>]
[<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
+ <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.
<p class="Pp">The options for <code class="Cm">got remove</code> are as
follows:</p>
</dd>
</dl>
</dd>
- <dt id="rm"><a class="permalink" href="#rm"><code class="Cm">rm</code></a></dt>
- <dd>Short alias for <code class="Cm">remove</code>.</dd>
- <dt id="revert"><a class="permalink" href="#revert"><code class="Cm">revert</code></a>
+ <dt id="rv"><a class="permalink" href="#revert"><code class="Cm" id="revert">revert</code></a>
[<code class="Fl">-p</code>] [<code class="Fl">-F</code>
<var class="Ar">response-script</var>] [<code class="Fl">-R</code>]
<var class="Ar">path ...</var></dt>
- <dd>Revert any local changes in files at the specified paths in a work tree.
+ <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.
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> is a directory.</dd>
</dl>
</dd>
- <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>
+ <dt id="ci"><a class="permalink" href="#commit"><code class="Cm" id="commit">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">-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
+ <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
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="Cm">got update</code> must be used first in order to merge
local changes with changes made in the repository.</p>
</dd>
- <dt id="ci"><a class="permalink" href="#ci"><code class="Cm">ci</code></a></dt>
- <dd>Short alias for <code class="Cm">commit</code>.</dd>
- <dt id="send"><a class="permalink" href="#send"><code class="Cm">send</code></a>
+ <dt id="se"><a class="permalink" href="#send"><code class="Cm" id="send">send</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-b</code>
<var class="Ar">branch</var>] [<code class="Fl">-d</code>
<var class="Ar">branch</var>] [<code class="Fl">-f</code>]
[<code class="Fl">-t</code> <var class="Ar">tag</var>]
[<code class="Fl">-T</code>] [<code class="Fl">-q</code>]
[<code class="Fl">-v</code>] [<var class="Ar">remote-repository</var>]</dt>
- <dd>Send new changes to a remote repository. If no
+ <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
<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
increase the verbosity. The maximum is 3.</dd>
</dl>
</dd>
- <dt id="se"><a class="permalink" href="#se"><code class="Cm">se</code></a></dt>
- <dd>Short alias for <code class="Cm">send</code>.</dd>
- <dt id="cherrypick"><a class="permalink" href="#cherrypick"><code class="Cm">cherrypick</code></a>
+ <dt id="cy"><a class="permalink" href="#cherrypick"><code class="Cm" id="cherrypick">cherrypick</code></a>
<var class="Ar">commit</var></dt>
- <dd>Merge changes from a single <var class="Ar">commit</var> into the work
+ <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
<code class="Cm">got update</code>. If any relevant files already
contain merge conflicts, these conflicts must be resolved first.</p>
</dd>
- <dt id="cy"><a class="permalink" href="#cy"><code class="Cm">cy</code></a></dt>
- <dd>Short alias for <code class="Cm">cherrypick</code>.</dd>
- <dt id="backout"><a class="permalink" href="#backout"><code class="Cm">backout</code></a>
+ <dt id="bo"><a class="permalink" href="#backout"><code class="Cm" id="backout">backout</code></a>
<var class="Ar">commit</var></dt>
- <dd>Reverse-merge changes from a single <var class="Ar">commit</var> into the
+ <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
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
<code class="Cm">got update</code>. If any relevant files already
contain merge conflicts, these conflicts must be resolved first.</p>
</dd>
- <dt id="bo"><a class="permalink" href="#bo"><code class="Cm">bo</code></a></dt>
- <dd>Short alias for <code class="Cm">backout</code>.</dd>
- <dt id="rebase"><a class="permalink" href="#rebase"><code class="Cm">rebase</code></a>
+ <dt id="rb"><a class="permalink" href="#rebase"><code class="Cm" id="rebase">rebase</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
[<code class="Fl">-l</code>] [<code class="Fl">-X</code>]
[<var class="Ar">branch</var>]</dt>
- <dd>Rebase commits on the specified <var class="Ar">branch</var> onto the tip
+ <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
<dt id="a~5"><a class="permalink" href="#a~5"><code class="Fl">-a</code></a></dt>
<dd>Abort an interrupted rebase operation. If this option is used, no
other command-line arguments are allowed.</dd>
- <dt id="c~9"><a class="permalink" href="#c~9"><code class="Fl">-c</code></a></dt>
+ <dt id="c~10"><a class="permalink" href="#c~10"><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>
</dl>
</dd>
- <dt id="rb"><a class="permalink" href="#rb"><code class="Cm">rb</code></a></dt>
- <dd>Short alias for <code class="Cm">rebase</code>.</dd>
- <dt id="histedit"><a class="permalink" href="#histedit"><code class="Cm">histedit</code></a>
+ <dt id="he"><a class="permalink" href="#histedit"><code class="Cm" id="histedit">histedit</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
[<code class="Fl">-e</code>] [<code class="Fl">-f</code>]
[<code class="Fl">-F</code> <var class="Ar">histedit-script</var>]
[<code class="Fl">-m</code>] [<code class="Fl">-l</code>]
[<code class="Fl">-X</code>] [<var class="Ar">branch</var>]</dt>
- <dd>Edit commit history between the work tree's current base commit and the
+ <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.
<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
<dt id="a~6"><a class="permalink" href="#a~6"><code class="Fl">-a</code></a></dt>
<dd>Abort an interrupted histedit operation. If this option is used, no
other command-line arguments are allowed.</dd>
- <dt id="c~10"><a class="permalink" href="#c~10"><code class="Fl">-c</code></a></dt>
+ <dt id="c~11"><a class="permalink" href="#c~11"><code class="Fl">-c</code></a></dt>
<dd>Continue an interrupted histedit operation. If this option is used, no
other command-line arguments are allowed.</dd>
<dt id="e"><a class="permalink" href="#e"><code class="Fl">-e</code></a></dt>
</dd>
</dl>
</dd>
- <dt id="he"><a class="permalink" href="#he"><code class="Cm">he</code></a></dt>
- <dd>Short alias for <code class="Cm">histedit</code>.</dd>
- <dt id="integrate"><a class="permalink" href="#integrate"><code class="Cm">integrate</code></a>
+ <dt id="ig"><a class="permalink" href="#integrate"><code class="Cm" id="integrate">integrate</code></a>
<var class="Ar">branch</var></dt>
- <dd>Integrate the specified <var class="Ar">branch</var> into the work tree's
+ <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
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
must first be committed with <code class="Cm">got commit</code> or
reverted with <code class="Cm">got revert</code>.</p>
</dd>
- <dt id="ig"><a class="permalink" href="#ig"><code class="Cm">ig</code></a></dt>
- <dd>Short alias for <code class="Cm">integrate</code>.</dd>
- <dt id="merge"><a class="permalink" href="#merge"><code class="Cm">merge</code></a>
+ <dt id="mg"><a class="permalink" href="#merge"><code class="Cm" id="merge">merge</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
[<code class="Fl">-n</code>] [<var class="Ar">branch</var>]</dt>
- <dd>Create a merge commit based on the current branch of the work tree and the
+ <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
<dt id="a~7"><a class="permalink" href="#a~7"><code class="Fl">-a</code></a></dt>
<dd>Abort an interrupted merge operation. If this option is used, no other
command-line arguments are allowed.</dd>
- <dt id="c~11"><a class="permalink" href="#c~11"><code class="Fl">-c</code></a></dt>
+ <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>
merge -a</code>.</dd>
</dl>
</dd>
- <dt id="mg"><a class="permalink" href="#mg"><code class="Cm">mg</code></a></dt>
- <dd>Short alias for <code class="Cm">merge</code>.</dd>
- <dt id="stage"><a class="permalink" href="#stage"><code class="Cm">stage</code></a>
+ <dt id="sg"><a class="permalink" href="#stage"><code class="Cm" id="stage">stage</code></a>
[<code class="Fl">-l</code>] [<code class="Fl">-p</code>]
[<code class="Fl">-F</code> <var class="Ar">response-script</var>]
[<code class="Fl">-S</code>] [<var class="Ar">path ...</var>]</dt>
- <dd>Stage local changes for inclusion in the next commit. If no
+ <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
<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
updated with <code class="Cm">got update</code>, and may then be staged
again if necessary.</p>
</dd>
- <dt id="sg"><a class="permalink" href="#sg"><code class="Cm">sg</code></a></dt>
- <dd>Short alias for <code class="Cm">stage</code>.</dd>
- <dt id="unstage"><a class="permalink" href="#unstage"><code class="Cm">unstage</code></a>
+ <dt id="ug"><a class="permalink" href="#unstage"><code class="Cm" id="unstage">unstage</code></a>
[<code class="Fl">-p</code>] [<code class="Fl">-F</code>
<var class="Ar">response-script</var>] [<var class="Ar">path ...</var>]</dt>
- <dd>Merge staged changes back into the work tree and put affected paths back
+ <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
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.
prompting interactively.</dd>
</dl>
</dd>
- <dt id="ug"><a class="permalink" href="#ug"><code class="Cm">ug</code></a></dt>
- <dd>Short alias for <code class="Cm">unstage</code>.</dd>
<dt id="cat"><a class="permalink" href="#cat"><code class="Cm">cat</code></a>
[<code class="Fl">-c</code> <var class="Ar">commit</var>]
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
<p class="Pp">The options for <code class="Cm">got cat</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~12"><a class="permalink" href="#c~12"><code class="Fl">-c</code></a>
+ <dt id="c~13"><a class="permalink" href="#c~13"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Look up paths in the specified <var class="Ar">commit</var>. If this
option is not used, paths are looked up in the commit resolved via the
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="P~2"><a class="permalink" href="#P~2"><code class="Fl">-P</code></a></dt>
+ <dt id="P~3"><a class="permalink" href="#P~3"><code class="Fl">-P</code></a></dt>
<dd>Interpret all arguments as paths only. This option can be used to
resolve ambiguity in cases where paths look like tag names, reference
names, or object IDs.</dd>
<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
“master” branch can be sent to the remote repository with
- <code class="Cm">got send.</code> Usually, <code class="Cm">got send</code>
+ <code class="Cm">got send</code>. Usually, <code class="Cm">got send</code>
can be run without further arguments. The arguments shown here match
defaults, provided the work tree's current branch is the
“master” branch:</p>
</div>
<table class="foot">
<tr>
- <td class="foot-date">October 3, 2021</td>
+ <td class="foot-date">October 16, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - a442e641d81204862a9da3df8477f8a37b12519d
blob + fd9481b2df276f0bc8852f7427a06152baf5fe04
--- got.conf.5.html
+++ got.conf.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">October 3, 2021</td>
+ <td class="foot-date">October 16, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 0d6a32a1fc77482b7d998624f471684bbfe7703b
blob + a3e15b76a95ccd576c67a4991bfe81cc32d8eac7
--- gotadmin.1.html
+++ gotadmin.1.html
</dd>
</dl>
</dd>
- <dt id="indexpack"><a class="permalink" href="#indexpack"><code class="Cm">indexpack</code></a>
+ <dt id="ix"><a class="permalink" href="#indexpack"><code class="Cm" id="indexpack">indexpack</code></a>
<var class="Ar">packfile-path</var></dt>
- <dd>Create a pack index for the pack file at
+ <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
<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
filename of the corresponding pack index is equivalent, except that it
ends in <span class="Pa">.idx</span>.</p>
</dd>
- <dt id="ix"><a class="permalink" href="#ix"><code class="Cm">ix</code></a></dt>
- <dd>Short alias for <code class="Cm">indexpack</code>.</dd>
- <dt id="listpack"><a class="permalink" href="#listpack"><code class="Cm">listpack</code></a>
+ <dt id="ls"><a class="permalink" href="#listpack"><code class="Cm" id="listpack">listpack</code></a>
[<code class="Fl">-h</code>] [<code class="Fl">-s</code>]
<var class="Ar">packfile-path</var></dt>
- <dd>List the contents of the pack file at <var class="Ar">packfile-path</var>.
+ <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>.
<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>
break-down of the number of objects per object type.</dd>
</dl>
</dd>
- <dt id="ls"><a class="permalink" href="#ls"><code class="Cm">ls</code></a></dt>
- <dd>Short alias for <code class="Cm">listpack</code>.</dd>
- <dt id="cleanup"><a class="permalink" href="#cleanup"><code class="Cm">cleanup</code></a>
+ <dt id="cl"><a class="permalink" href="#cleanup"><code class="Cm" id="cleanup">cleanup</code></a>
[<code class="Fl">-a</code>] [<code class="Fl">-p</code>]
[<code class="Fl">-n</code>] [<code class="Fl">-r</code>
<var class="Ar">repository-path</var>] [<code class="Fl">-q</code>]</dt>
- <dd>Purge unreferenced loose objects from the repository and display the
+ <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.
<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>
<dd>Suppress progress reporting and disk space summary output.</dd>
</dl>
</dd>
- <dt id="cl"><a class="permalink" href="#cl"><code class="Cm">cl</code></a></dt>
- <dd>Short alias for <code class="Cm">cleanup</code>.</dd>
</dl>
</section>
<section class="Sh">
</div>
<table class="foot">
<tr>
- <td class="foot-date">October 3, 2021</td>
+ <td class="foot-date">October 16, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 93b2503364dc77b97ced6c6bd2a8d22ebe29890a
blob + ccd0acc3767f8655fcfd6dce6542a475c7f72a1c
--- gotweb.8.html
+++ gotweb.8.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">October 3, 2021</td>
+ <td class="foot-date">October 16, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 1406d2a29c03fb22e542b5ce95e9c71707d4cd11
blob + bc7dfab4868268897de4cce4591f0d24c2975ba8
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">October 3, 2021</td>
+ <td class="foot-date">October 16, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
blob - 21c63c0e9a5fcbc2d7ea6d171b86b27747c548a6
blob + b5c1612fdcb6a2f32b2b498de92b2c1739d6e1d5
--- tog.1.html
+++ tog.1.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">October 3, 2021</td>
+ <td class="foot-date">October 16, 2021</td>
<td class="foot-os">OpenBSD 7.0</td>
</tr>
</table>
