commit - e4a79cad8dfb580418fc196503baf714f2fe12f8
commit + 461d9094e8d058d6276d41305a7575a0a01bfc3e
blob - bd50835d18f682e633d6c7ce501ef60173299b56
blob + 5e75d273aad07eee93d005dc742347f3c31cd173
--- 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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 6f543586d86863a3d61c9c4ee8c80e21930538c7
blob + 08e2e3a332dcfb1c79061dec71230aa94190e15a
--- 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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 82fa9fe4e80023c45c460b8314d7b5a35f4b0fe3
blob + 6071c6dc6fa95ce97459e7db018c6c520c7b72ca
--- 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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - d75d3ef41ad1b440db0637ed00d9cc850edc0854
blob + 8275943f5604e103f6495b02c2da3c81831702db
--- got.1.html
+++ got.1.html
<dd>Use the specified log message when creating the new commit. Without
the <code class="Fl">-m</code> option, <code class="Cm">got
import</code> opens a temporary file in an editor where a log message
- can be written.</dd>
+ can be written. Quitting the editor without saving the file will abort
+ the import operation.</dd>
<dt id="r"><a class="permalink" href="#r"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
“refs/heads/” reference namespace, rather than to
branches in the “refs/remotes/” namespace. This avoids
the usual requirement of having to run <code class="Cm">got
- rebase</code> after <code class="Cm">got fetch</code> in order to
- make incoming changes appear on branches in the
- “refs/heads/” namespace. But maintaining custom
- changes in the cloned repository becomes difficult since such
- changes will be at risk of being discarded whenever incoming changes
- are fetched.</p>
+ rebase</code> or <code class="Cm">got merge</code> after
+ <code class="Cm">got fetch</code> in order to make incoming changes
+ appear on branches in the “refs/heads/” namespace. But
+ maintaining custom changes in the cloned repository becomes
+ difficult since such changes will be at risk of being discarded
+ whenever incoming changes are fetched.</p>
</dd>
<dt id="q"><a class="permalink" href="#q"><code class="Fl">-q</code></a></dt>
<dd>Suppress progress reporting output. The same option will be passed to
<p class="Pp">By default, branch references in the
“refs/remotes/” reference namespace will be updated to
point at the newly fetched commits. The <code class="Cm">got
- rebase</code> command can then be used to make new changes visible on
- branches in the “refs/heads/” namespace, merging incoming
- changes with the changes on those branches as necessary.</p>
+ rebase</code> or <code class="Cm">got merge</code> command can then be
+ used to make new changes visible on 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
“refs/heads/” namespace will be updated directly to match
<dt id="c"><a class="permalink" href="#c"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Check out files from the specified <var class="Ar">commit</var> on the
- selected branch. 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. If this option is
- not specified, the most recent commit on the selected branch will be
- used.
+ selected branch. If this option is not specified, the most recent
+ commit on the selected branch will be used.
+ <p class="Pp">The expected <var class="Ar">commit</var> argument is a
+ commit ID SHA1 hash, or a reference name or a keyword 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. The keywords ":base" and
+ ":head" resolve to the repository's HEAD reference, or, if
+ the <code class="Fl">-b</code> option is used, the head of the
+ checked-out <var class="Ar">branch</var>. Keywords and reference
+ names may be appended with ":+" or ":-"
+ modifiers and an optional integer N to denote the Nth descendant or
+ antecedent by first parent traversal, respectively; for example,
+ <b class="Sy">:head:-2</b> denotes the work tree branch head's 2nd
+ generation ancestor, and <b class="Sy">foo:-3</b> will denote the
+ 3rd generation ancestor of the commit resolved by the
+ "foo" reference. If an integer does not follow the
+ ":+" or ":-" modifier, a "1" is
+ implicitly appended (e.g., <b class="Sy">:head:-</b> is equivalent
+ to <b class="Sy">:head:-1</b>).</p>
<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>
</dd>
<dt id="c~2"><a class="permalink" href="#c~2"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
- <dd>Update the work tree to the specified <var class="Ar">commit</var>.
- 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. If this option is
- not specified, the most recent commit on the work tree's branch will
- be used.</dd>
+ <dd>Update the work tree to the specified <var class="Ar">commit</var>. If
+ this option is not specified, the most recent commit on the work
+ tree's branch will be used.
+ <p class="Pp">The expected <var class="Ar">commit</var> argument is a
+ commit ID SHA1 hash, or a reference name or a keyword 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. The keywords ":base" and
+ ":head" resolve to the work tree's base commit and branch
+ head, respectively. Keywords and reference names may be appended
+ with ":+" or ":-" modifiers and an optional
+ integer N to denote the Nth descendant or antecedent, respectively,
+ by first parent traversal; for example, <b class="Sy">:head:-2</b>
+ denotes the work tree branch head's 2nd generation ancestor, and
+ <b class="Sy">:base:+4</b> denotes the 4th generation descendant of
+ the work tree's base commit. Similarly, <b class="Sy">foo:-3</b>
+ will denote the 3rd generation ancestor of the commit resolved by
+ the "foo" reference. If an integer does not follow the
+ ":+" or ":-" modifier, a "1" is
+ implicitly appended (e.g., <b class="Sy">:head:-</b> is equivalent
+ to <b class="Sy">:head:-1</b>).</p>
+ </dd>
<dt id="q~4"><a class="permalink" href="#q~4"><code class="Fl">-q</code></a></dt>
<dd>Silence progress output.</dd>
</dl>
<dt id="c~3"><a class="permalink" href="#c~3"><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
- 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. If
- this option is not specified, default to the work tree's current
- branch if invoked in a work tree, or to the repository's HEAD
- reference.</dd>
+ <var class="Ar">commit</var>. If this option is not specified, default
+ to the work tree's current branch if invoked in a work tree, or to the
+ repository's HEAD reference.
+ <p class="Pp" id="bar:+3">The expected <var class="Ar">commit</var>
+ argument is a commit ID SHA1 hash, or a reference name or a keyword
+ 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. The keywords ":base" and
+ ":head" resolve to the work tree's base commit and branch
+ head, respectively. The former is only valid if invoked in a work
+ tree, while the latter will resolve to the tip of the work tree's
+ current branch if invoked in a work tree, otherwise it will resolve
+ to the repository's HEAD reference. Keywords and references may be
+ appended with ":+" or ":-" modifiers and an
+ optional integer N to denote the Nth descendant or antecedent,
+ respectively, by first parent traversal; for example,
+ <b class="Sy">:head:-2</b> denotes the HEAD reference's 2nd
+ generation ancestor, and <b class="Sy">:base:+4</b> denotes the 4th
+ generation descendant of the work tree's base commit. Similarly,
+ <a class="permalink" href="#bar:+3"><b class="Sy">bar:+3</b></a>
+ will denote the 3rd generation descendant of the commit resolved by
+ the "bar" reference. A ":+" or ":-"
+ modifier without a trailing integer has an implicit "1"
+ appended (e.g., <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</p>
+ </dd>
<dt id="d~2"><a class="permalink" href="#d~2"><code class="Fl">-d</code></a></dt>
<dd>Display diffstat of changes introduced in each commit. Cannot be used
with the <code class="Fl">-s</code> option.</dd>
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" id="baz:+8">The expected <var class="Ar">commit</var>
+ argument is a commit ID SHA1 hash, or a reference name or a keyword
+ 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. The keywords ":base" and
+ ":head" resolve to the work tree's base commit and branch
+ head, respectively. The former is only valid if invoked in a work
+ tree, while the latter will resolve to the tip of the work tree's
+ current branch if invoked in a work tree, otherwise it will resolve
+ to the repository's HEAD reference. Keywords and references may be
+ appended with ":+" or ":-" modifiers and an
+ optional integer N to denote the Nth descendant or antecedent,
+ respectively, by first parent traversal; for example,
+ <b class="Sy">:head:-2</b> denotes the HEAD reference's 2nd
+ generation ancestor, and <b class="Sy">:base:+4</b> denotes the 4th
+ generation descendant of the work tree's base commit. Similarly,
+ <a class="permalink" href="#baz:+8"><b class="Sy">baz:+8</b></a>
+ will denote the 8th generation descendant of the commit resolved by
+ the "baz" reference. If an integer does not follow the
+ ":+" or ":-" modifier, a "1" is
+ implicitly appended (e.g., <b class="Sy">:head:-</b> is equivalent
+ to <b class="Sy">:head:-1</b>).</p>
<p class="Pp">Cannot be used together with the
<code class="Fl">-P</code> option.</p>
</dd>
<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
- 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.</dd>
+ SHA1 hash, or a reference name or a keyword 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. The
+ keywords ":base" and ":head" resolve to the work
+ tree's base commit and branch head, respectively. The former is only
+ valid if invoked in a work tree, while the latter will resolve to the
+ tip of the work tree's current branch if invoked in a work tree,
+ otherwise it will resolve to the repository's HEAD reference. Keywords
+ and references may be appended with ":+" or ":-"
+ modifiers and an optional integer N to denote the Nth descendant or
+ antecedent by first parent traversal, respectively; for example,
+ <b class="Sy">:head:-2</b> denotes the work tree branch head's 2nd
+ generation ancestor, and <b class="Sy">:base:+4</b> denotes the 4th
+ generation descendant of the work tree's base commit. Similarly,
+ <a class="permalink" href="#xyz:-5"><b class="Sy" id="xyz:-5">xyz:-5</b></a>
+ will denote the 5th generation ancestor of the commit resolved by the
+ "xyz" reference. A ":+" or ":-" modifier
+ without a trailing integer has an implicit "1" appended
+ (e.g., <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</dd>
<dt id="r~5"><a class="permalink" href="#r~5"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
<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
- 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.</dd>
+ <var class="Ar">commit</var>.
+ <p class="Pp" id="spam:-3">The expected argument is a commit ID SHA1
+ hash, or a reference name or a keyword 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. The
+ keywords ":base" and ":head" resolve to the work
+ tree's base commit and branch head, respectively. The former is only
+ valid if invoked in a work tree, while the latter will resolve to
+ the tip of the work tree's current branch if invoked in a work tree,
+ otherwise it will resolve to the repository's HEAD reference.
+ Keywords and references may be appended with ":+" or
+ ":-" modifiers and an optional integer N to denote the Nth
+ descendant or antecedent by first parent traversal, respectively;
+ for example, <b class="Sy">:head:-2</b> denotes the work tree branch
+ head's 2nd generation ancestor, and <b class="Sy">:base:+4</b>
+ denotes the 4th generation descendant of the work tree's base
+ commit. Similarly,
+ <a class="permalink" href="#spam:-3"><b class="Sy">spam:-3</b></a>
+ will denote the 3rd generation ancestor of the commit resolved by
+ the "spam" reference. A ":+" or ":-"
+ modifier without a trailing integer has an implicit "1"
+ appended (e.g., <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</p>
+ </dd>
<dt id="i"><a class="permalink" href="#i"><code class="Fl">-i</code></a></dt>
<dd>Show object IDs of files (blob objects) and directories (tree
objects).</dd>
<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
- <var class="Ar">object</var>. The expected
- <var class="Ar">object</var> argument is a ID SHA1 hash or an existing
- reference or tag name which will be resolved to the ID of a
- corresponding commit, tree, tag, or blob object. Cannot be used
- together with any other options except
- <code class="Fl">-r</code>.</dd>
+ <var class="Ar">object</var>.
+ <p class="Pp" id="tagged:-3">The expected <var class="Ar">object</var>
+ argument is an ID SHA1 hash or an existing reference or tag name or
+ a keyword which will be resolved to the ID of a corresponding
+ commit, tree, tag, or blob object. An abbreviated hash argument will
+ be expanded to a full SHA1 hash automatically, provided the
+ abbreviation is unique. The keywords ":base" and
+ ":head" resolve to the work tree's base commit and branch
+ head, respectively. The former is only valid if invoked in a work
+ tree, while the latter will resolve to the tip of the work tree's
+ current branch if invoked in a work tree, otherwise it will resolve
+ to the repository's HEAD reference. Keywords and reference names may
+ be appended with ":+" or ":-" modifiers and an
+ optional integer N to denote the Nth descendant or antecedent by
+ first parent traversal, respectively; for example,
+ <b class="Sy">:head:-2</b> denotes the work tree branch head's 2nd
+ generation ancestor, and
+ <a class="permalink" href="#tagged:-3"><b class="Sy">tagged:-3</b></a>
+ will denote the 3rd generation ancestor of the commit resolved by
+ the "tagged" reference. If an integer does not follow the
+ ":+" or ":-" modifier, a "1" is
+ implicitly appended (e.g., <b class="Sy">:head:-</b> is equivalent
+ to <b class="Sy">:head:-1</b>).</p>
+ <p class="Pp">Cannot be used together with any other options except
+ <code class="Fl">-r</code>.</p>
+ </dd>
<dt id="d~4"><a class="permalink" href="#d~4"><code class="Fl">-d</code></a></dt>
<dd>Delete the reference with the specified <var class="Ar">name</var>
from the repository. Any commit, tree, tag, and blob objects belonging
<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
- <var class="Ar">commit</var> argument is a commit ID SHA1 hash or an
- existing reference or tag name which will be resolved to a commit
- ID.</dd>
+ <var class="Ar">commit</var>. The expected argument is a commit ID
+ SHA1 hash, or a reference name or keyword 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. The
+ keywords ":base" and ":head" resolve to the work
+ tree's base commit and branch head, respectively. The former is only
+ valid if invoked in a work tree, while the latter will resolve to the
+ tip of the work tree's current branch if invoked in a work tree,
+ otherwise it will resolve to the repository's HEAD reference. Keywords
+ and references may be appended with ":+" or ":-"
+ modifiers and an optional integer N to denote the Nth descendant or
+ antecedent by first parent traversal, respectively; for example,
+ <b class="Sy">:head:-2</b> denotes the work tree branch head's 2nd
+ generation ancestor, and <b class="Sy">:base:+4</b> denotes the 4th
+ generation descendant of the work tree's base commit. Similarly,
+ <a class="permalink" href="#foobar:+3"><b class="Sy" id="foobar:+3">foobar:+3</b></a>
+ will denote the 3rd generation descendant of the commit resolved by
+ the "foobar" reference. A ":+" or ":-"
+ modifier without a trailing integer has an implicit "1"
+ appended (e.g., <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</dd>
<dt id="d~5"><a class="permalink" href="#d~5"><code class="Fl">-d</code></a>
<var class="Ar">name</var></dt>
<dd>Delete the branch with the specified <var class="Ar">name</var> from
remote repositories' branches in the “refs/remotes/”
reference namespace.
<p class="Pp">If invoked in a work tree, the work tree's current branch
- is shown with one the following annotations:</p>
+ is shown with one of the following annotations:</p>
<table class="Bl-column">
<tr>
<td>*</td>
<var class="Ar">commit</var></dt>
<dd>Make the newly created tag reference point at the specified
<var class="Ar">commit</var>. The expected
- <var class="Ar">commit</var> 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.</dd>
+ <var class="Ar">commit</var> argument is a commit ID SHA1 hash, or a
+ reference or keyword 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. The keywords
+ ":base" and ":head" resolve to the work tree's
+ base commit and branch head, respectively. The former is only valid if
+ invoked in a work tree, while the latter will resolve to the tip of
+ the work tree's current branch if invoked in a work tree, otherwise it
+ will resolve to the repository's HEAD reference. Keywords and
+ references may be appended with ":+" or ":-"
+ modifiers and an optional integer N to denote the Nth descendant or
+ antecedent by first parent traversal, respectively; for example,
+ <b class="Sy">:head:-2</b> denotes the work tree branch head's 2nd
+ generation ancestor, and <b class="Sy">:base:+4</b> denotes the 4th
+ generation descendant of the work tree's base commit. Similarly,
+ <a class="permalink" href="#eggs:-3"><b class="Sy" id="eggs:-3">eggs:-3</b></a>
+ will denote the 3rd generation ancestor of the commit resolved by the
+ "eggs" reference. A ":+" or ":-"
+ modifier without a trailing integer has an implicit "1"
+ appended (e.g., <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</dd>
<dt id="l~6"><a class="permalink" href="#l~6"><code class="Fl">-l</code></a></dt>
<dd>List all existing tags in the repository instead of creating a new
tag. If a <var class="Ar">name</var> argument is passed, show only the
<dd>Use the specified tag message when creating the new tag. Without the
<code class="Fl">-m</code> option, <code class="Cm">got tag</code>
opens a temporary file in an editor where a tag message can be
- written.</dd>
+ written. Quitting the editor without saving the file will abort the
+ tag operation.</dd>
<dt id="r~9"><a class="permalink" href="#r~9"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
<var class="Ar">commit</var></dt>
<dd>Attempt to locate files within the specified
<var class="Ar">commit</var> for use as a merge-base for 3-way merges.
- Ideally, the specified <var class="Ar">commit</var> should contain
- versions of files which the changes contained in the
- <var class="Ar">patchfile</var> were based on. Files will be located
- by path, relative to the repository root. If the
- <code class="Fl">-p</code> option is used then leading path components
- will be stripped before paths are looked up in the repository.
<p class="Pp">If the <code class="Fl">-c</code> option is not used then
<code class="Cm">got patch</code> will attempt to locate merge-bases
via object IDs found in <var class="Ar">patchfile</var> meta-data,
<a class="Xr" aria-label="git-diff, section 1">git-diff(1)</a>. Use
of the <code class="Fl">-c</code> option is only recommended in the
absence of such meta-data.</p>
+ <p class="Pp">Ideally, the specified <var class="Ar">commit</var> should
+ contain versions of files which the changes contained in the
+ <var class="Ar">patchfile</var> were based on. Files will be located
+ by path, relative to the repository root. If the
+ <code class="Fl">-p</code> option is used then leading path
+ components will be stripped before paths are looked up in the
+ repository.</p>
<p class="Pp">In case no merge-base is available for a file, changes
will be applied without doing a 3-way merge. Changes which do not
apply cleanly may then be rejected entirely, rather than producing
merge conflicts in the patched target file.</p>
+ <p class="Pp" id="flan:+3">The expected <var class="Ar">commit</var>
+ argument is a commit ID SHA1 hash, or a reference name or a keyword
+ 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. The keywords ":base" and
+ ":head" resolve to the work tree's base commit and branch
+ head, respectively. Keywords and references may be appended with
+ ":+" or ":-" modifiers and an optional integer N
+ to denote the Nth descendant or antecedent by first parent
+ traversal, respectively; for example, <b class="Sy">:head:-2</b>
+ denotes the work tree branch head's 2nd generation ancestor, and
+ <b class="Sy">:base:+4</b> denotes the 4th generation descendant of
+ the work tree's base commit. Similarly,
+ <a class="permalink" href="#flan:+3"><b class="Sy">flan:+3</b></a>
+ will denote the 3rd generation descendant of the commit resolved by
+ the "flan" reference. A ":+" or ":-"
+ modifier without a trailing integer has an implicit "1"
+ appended (e.g., <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</p>
</dd>
<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
an editor where a log message can be written unless the
<code class="Fl">-m</code> option is used or the
<code class="Fl">-F</code> and <code class="Fl">-N</code> options are
- used together.</p>
+ used together. Quitting the editor without saving the file will abort
+ the commit operation.</p>
<p class="Pp">Show the status of each affected file, using the following
status codes:</p>
<table class="Bl-column">
</dd>
<dt id="f~2"><a class="permalink" href="#f~2"><code class="Fl">-f</code></a></dt>
<dd>Attempt to force the server to overwrite existing branches or tags in
- the remote repository, even when <code class="Cm">got fetch</code> and
- <code class="Cm">got rebase</code> would usually be required before
- changes can be sent. The server may reject forced requests regardless,
- depending on its configuration.
+ the remote repository, even when <code class="Cm">got fetch</code>
+ followed by <code class="Cm">got rebase</code> or <code class="Cm">got
+ merge</code> would usually be required before changes can be sent. The
+ server may reject forced requests regardless, depending on its
+ configuration.
<p class="Pp">Any commit, tree, tag, and blob objects belonging to
overwritten branches or tags may become subject to deletion by Git's
garbage collector running on the server.</p>
out-of-date copy of a branch in the remote repository. Instead of
using the <code class="Fl">-f</code> option, new changes should be
fetched with <code class="Cm">got fetch</code> and local branches
- should be rebased with <code class="Cm">got rebase</code>, followed
- by another attempt to send the changes.</p>
+ should be rebased with <code class="Cm">got rebase</code> or merged
+ with <code class="Cm">got merge</code>, followed by another attempt
+ to send the changes.</p>
<p class="Pp">The <code class="Fl">-f</code> option should only be
needed in situations where the remote repository's copy of a branch
or tag is known to be out-of-date and is considered disposable. The
<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 expanded to a
- full SHA1 hash automatically, provided the abbreviation is unique.
+ than the work tree's base commit.
+ <p class="Pp" id="barbaz:+3">The expected argument is a commit ID SHA1 hash,
+ or a reference name or keyword 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. The keywords
+ ":base" and ":head" resolve to the work tree's base
+ commit and branch head, respectively. Keywords and references may be
+ appended with ":+" or ":-" modifiers and an optional
+ integer N to denote the Nth descendant or antecedent by first parent
+ traversal, respectively; for example, <b class="Sy">:head:-2</b> denotes
+ the work tree branch head's 2nd generation ancestor, and
+ <b class="Sy">:base:+4</b> denotes the 4th generation descendant of the
+ work tree's base commit. Similarly,
+ <a class="permalink" href="#barbaz:+3"><b class="Sy">barbaz:+3</b></a>
+ will denote the 3rd generation descendant of the commit resolved by the
+ "barbaz" reference. A ":+" or ":-"
+ modifier without a trailing integer has an implicit "1"
+ appended (e.g., <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</p>
<p class="Pp">Show the status of each affected file, using the following
status codes:</p>
<table class="Bl-column">
<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
- expanded to a full SHA1 hash automatically, provided the abbreviation is
- unique.
+ same branch as the work tree's base commit.
+ <p class="Pp" id="wip:+5">The expected argument is a commit ID SHA1 hash, or
+ a reference name or keyword 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. The keywords
+ ":base" and ":head" resolve to the work tree's base
+ commit and branch head, respectively. Keywords and references may be
+ appended with ":+" or ":-" modifiers and an optional
+ integer N to denote the Nth descendant or antecedent by first parent
+ traversal, respectively; for example, <b class="Sy">:head:-2</b> denotes
+ the work tree branch head's 2nd generation ancestor, and
+ <b class="Sy">:base:+4</b> denotes the 4th generation descendant of the
+ work tree's base commit. Similarly,
+ <a class="permalink" href="#wip:+5"><b class="Sy">wip:+5</b></a> will
+ denote the 5th generation descendant of the commit resolved by the
+ "wip" reference. A ":+" or ":-" modifier
+ without a trailing integer has an implicit "1" appended (e.g.,
+ <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</p>
<p class="Pp">Show the status of each affected file, using the following
status codes:</p>
<table class="Bl-column">
<code class="Fl">-c</code> option.</dd>
<dt id="c~11"><a class="permalink" href="#c~11"><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>
+ other command-line arguments are allowed except
+ <code class="Fl">-C</code>.</dd>
<dt id="l~9"><a class="permalink" href="#l~9"><code class="Fl">-l</code></a></dt>
<dd>Show a list of past rebase operations, represented by references in
the “refs/got/backup/rebase” reference namespace.
<var class="Ar">histedit script</var> which can be written in an editor
based on a template, passed on the command line, or generated with the
<code class="Fl">-d</code>, <code class="Fl">-e</code>,
- <code class="Fl">-f</code>, or <code class="Fl">-m</code> options.</p>
+ <code class="Fl">-f</code>, or <code class="Fl">-m</code> options.
+ Quitting the editor without saving the file will abort the histedit
+ operation.</p>
<p class="Pp">The format of the histedit script is line-based. Each line in
the script begins with a command name, followed by whitespace and an
argument. For most commands, the expected argument is a commit ID SHA1
with the <code class="Fl">-c</code> option.</dd>
<dt id="c~12"><a class="permalink" href="#c~12"><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>
+ other command-line arguments are allowed except
+ <code class="Fl">-C</code>.</dd>
<dt id="d~7"><a class="permalink" href="#d~7"><code class="Fl">-d</code></a></dt>
<dd>Drop all commits. This option is a quick equivalent to a histedit
script which drops all commits. The <code class="Fl">-d</code> option
reverted with <code class="Cm">got revert</code>.</p>
</dd>
<dt id="mg"><a class="permalink" href="#merge"><code class="Cm" id="merge">merge</code></a>
- [<code class="Fl">-aCcn</code>] [<var class="Ar">branch</var>]</dt>
+ [<code class="Fl">-aCcMn</code>] [<var class="Ar">branch</var>]</dt>
<dd>
<div class="Bd Bd-indent"><code class="Li">(alias:
<code class="Cm">mg</code>)</code></div>
<code class="Fl">-c</code> option.</dd>
<dt id="c~13"><a class="permalink" href="#c~13"><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>
+ other command-line arguments are allowed except
+ <code class="Fl">-C</code>.</dd>
+ <dt id="M"><a class="permalink" href="#M"><code class="Fl">-M</code></a></dt>
+ <dd>Create a merge commit even if the branches have not diverged.</dd>
<dt id="n~4"><a class="permalink" href="#n~4"><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
can be staged (however, this does not prevent the file from becoming
out-of-date at some point after having been staged).</p>
<p class="Pp">The <code class="Cm">got update</code>, <code class="Cm">got
- rebase</code>, and <code class="Cm">got histedit</code> commands will
- refuse to run while staged changes exist. If staged changes cannot be
- committed because a staged path is out of date, the path must be
- unstaged with <code class="Cm">got unstage</code> before it can be
- updated with <code class="Cm">got update</code>, and may then be staged
- again if necessary.</p>
+ rebase</code>, <code class="Cm">got merge</code>, and
+ <code class="Cm">got histedit</code> commands will refuse to run while
+ staged changes exist. If staged changes cannot be committed because a
+ staged path is out of date, the path must be unstaged with
+ <code class="Cm">got unstage</code> before it can be updated with
+ <code class="Cm">got update</code>, and may then be staged again if
+ necessary.</p>
</dd>
<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">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's HEAD reference. 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.</dd>
+ repository's HEAD reference.
+ <p class="Pp" id="quux:-8">The expected argument is a commit ID SHA1
+ hash, or a reference name or keyword 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. The
+ keywords ":base" and ":head" resolve to the work
+ tree's base commit and branch head, respectively. The former is only
+ valid if invoked in a work tree, while the latter will resolve to
+ the tip of the work tree's current branch if invoked in a work tree,
+ otherwise it will resolve to the repository's HEAD reference.
+ Keywords and references may be appended with ":+" or
+ ":-" modifiers and an optional integer N to denote the Nth
+ descendant or antecedent by first parent traversal, respectively;
+ for example, <b class="Sy">:head:-2</b> denotes the work tree branch
+ head's 2nd generation ancestor, and <b class="Sy">:base:+4</b>
+ denotes the 4th generation descendant of the work tree's base
+ commit. Similarly,
+ <a class="permalink" href="#quux:-8"><b class="Sy">quux:-8</b></a>
+ will denote the 8th generation ancestor of the commit resolved by
+ the "quux" reference. A ":+" or ":-"
+ modifier without a trailing integer has an implicit "1"
+ appended (e.g., <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</p>
+ </dd>
<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
Hacker</span>
<<a class="Mt" href="mailto:flan_hacker@openbsd.org">flan_hacker@openbsd.org</a>>”.
Used by the <code class="Cm">got commit</code>, <code class="Cm">got
- import</code>, <code class="Cm">got rebase</code>, and
- <code class="Cm">got histedit</code> commands. Because
+ import</code>, <code class="Cm">got rebase</code>, <code class="Cm">got
+ merge</code>, and <code class="Cm">got histedit</code> commands. Because
<a class="Xr" aria-label="git, section 1">git(1)</a> may fail to parse
commits without an email address in author data,
<code class="Nm">got</code> attempts to reject
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 18f5799c47715bf0500bcd0d513d0e0e7575dee2
blob + 867c14ae25405d5ebc9bf533cd09c1960ccae489
--- 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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - e8c2feee46a573054f6eff617563bdcd04a53a91
blob + f8800727e150ab3c2814676b096e8ade0e09ca58
--- gotadmin.1.html
+++ gotadmin.1.html
work tree.</dd>
</dl>
</dd>
+ <dt id="dump"><a class="permalink" href="#dump"><code class="Cm">dump</code></a>
+ [<code class="Fl">-q</code>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<code class="Fl">-x</code>
+ <var class="Ar">reference</var>] [<var class="Ar">reference ...</var>]</dt>
+ <dd>Dump the contents of the repository to standard output in Git bundle
+ format.
+ <p class="Pp">If one or more <var class="Ar">reference</var> arguments is
+ specified, only add objects which are reachable via the specified
+ references. Each <var class="Ar">reference</var> argument may either
+ specify a specific reference or a reference namespace, in which case all
+ references within this namespace will be used.</p>
+ <p class="Pp">The options for <code class="Nm">gotadmin</code>
+ <code class="Cm">dump</code> are as follows:</p>
+ <dl class="Bl-tag">
+ <dt id="q~3"><a class="permalink" href="#q~3"><code class="Fl">-q</code></a></dt>
+ <dd>Suppress progress reporting output.</dd>
+ <dt id="r~4"><a class="permalink" href="#r~4"><code class="Fl">-r</code></a>
+ <var class="Ar">repository-path</var></dt>
+ <dd>Use the repository at the specified path. If not specified, assume the
+ repository is located at or above the current working directory. If
+ this directory is a <a class="Xr" aria-label="got, section
+ 1">got(1)</a> work tree, use the repository path associated with this
+ work tree.</dd>
+ <dt id="x~2"><a class="permalink" href="#x~2"><code class="Fl">-x</code></a>
+ <var class="Ar">reference</var></dt>
+ <dd>Exclude objects reachable via the specified
+ <var class="Ar">reference</var> from the bundle. The
+ <var class="Ar">reference</var> argument may either specify a specific
+ reference or a reference namespace, in which case all references
+ within this namespace will be excluded. The <code class="Fl">-x</code>
+ option may be specified multiple times to build a list of references
+ to exclude.
+ <p class="Pp">Exclusion takes precedence over inclusion. If a reference
+ appears in both the included and excluded lists, it will be
+ excluded.</p>
+ </dd>
+ </dl>
+ </dd>
+ <dt id="load"><a class="permalink" href="#load"><code class="Cm">load</code></a>
+ [<code class="Fl">-nq</code>] [<code class="Fl">-l</code>
+ <var class="Ar">bundle-path</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<var class="Ar">reference
+ ...</var>]</dt>
+ <dd>Read a Git bundle stream from standard input and load its data into a
+ repository.
+ <p class="Pp">If one or more <var class="Ar">reference</var> arguments are
+ provided then only load the specified references from the bundle.
+ Otherwise, all references will be loaded.</p>
+ <p class="Pp">The options for <code class="Cm">gotadmin load</code> are as
+ follows:</p>
+ <dl class="Bl-tag">
+ <dt id="l"><a class="permalink" href="#l"><code class="Fl">-l</code></a>
+ <var class="Ar">bundle-path</var></dt>
+ <dd>List references available for loading from the bundle at the specified
+ <var class="Ar">bundle-path</var> and exit immediately. If the
+ <code class="Fl">-l</code> option is specified then no
+ <var class="Ar">reference</var> arguments are allowed. The
+ <code class="Fl">-l</code> option is incompatible with the
+ <code class="Fl">-n</code> option.</dd>
+ <dt id="n~2"><a class="permalink" href="#n~2"><code class="Fl">-n</code></a></dt>
+ <dd>Attempt to load the bundle but don't install new packfile or update
+ any reference. Can be used to verify the integrity of the bundle.</dd>
+ <dt id="q~4"><a class="permalink" href="#q~4"><code class="Fl">-q</code></a></dt>
+ <dd>Suppress progress reporting output.</dd>
+ <dt id="r~5"><a class="permalink" href="#r~5"><code class="Fl">-r</code></a>
+ <var class="Ar">repository-path</var></dt>
+ <dd>Use the repository at the specified path. If not specified, assume the
+ repository is located at or above the current working directory. If
+ this directory is a <a class="Xr" aria-label="got, section
+ 1">got(1)</a> work tree, use the repository path associated with this
+ work tree.</dd>
+ </dl>
+ </dd>
</dl>
</section>
<section class="Sh">
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 386bcae5223b2c4e38cdd35073dd99fe79fe0959
blob + 18dff53036e5f4204a3e7375b7b27ce180a405f8
--- 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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 30ea1b068c76d54e664ee5678f7ead409cd91e8f
blob + c418e6541a573c2184fbf60e7bcf765f947dbd83
--- 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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - a645cfc8de6c6b8eb9b060ef8e0d2667ed010f29
blob + 1ade4255b184333997e498ec2c3122c645e9d681
--- 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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - e29c65e8b8e2442fbac4f47da912dde7a603221a
blob + c8e411e4e7baba8677fe33e4f160ad192026c5d6
--- 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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - ca0b468af6bd8a398dc898a3aad3d0c5d272e86e
blob + 9147cbfe858dac841aaed05191542eeda383efe9
--- 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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - 5024fa55df74189c4bfe7106bab969a59ac4b963
blob + 83129d6cecd4180faf66f997a15a4909abeeaab1
--- gotwebd.conf.5.html
+++ gotwebd.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">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
blob - bd1e3d21966e0f24888c4a18072d964f75abe455
blob + 558c1e2e02380fe50f40487af87da93f21cd7af9
--- tog.1.html
+++ tog.1.html
<dt id="c"><a class="permalink" href="#c"><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 the name of a
- branch or a commit ID SHA1 hash. An abbreviated hash argument will be
- expanded to a full SHA1 hash automatically, provided the abbreviation
- is unique. If this option is not specified, default to the work tree's
- current branch if invoked in a work tree, or to the repository's HEAD
- reference.</dd>
+ <var class="Ar">commit</var>. The expected argument is a commit ID
+ SHA1 hash, or a reference name or keyword 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. The
+ keywords ":base" and ":head" resolve to the work
+ tree's base commit and branch head, respectively. The former is only
+ valid if invoked in a work tree, while the latter will resolve to the
+ tip of the work tree's current branch if invoked in a work tree,
+ otherwise it will resolve to the repository's HEAD reference. Keywords
+ and references may be appended with ":+" or ":-"
+ modifiers and an optional integer N to denote the Nth descendant or
+ antecedent by first parent traversal, respectively; for example,
+ <b class="Sy">:head:-2</b> denotes the work tree branch head's 2nd
+ generation ancestor, and <b class="Sy">:base:+4</b> denotes the 4th
+ generation descendant of the work tree's base commit. Similarly,
+ <b class="Sy">foobar:+3</b> will denote the 3rd generation descendant
+ of the commit resolved by the "foobar" reference. A
+ ":+" or ":-" modifier without a trailing integer
+ has an implicit "1" appended (e.g.,
+ <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</dd>
<dt id="r"><a class="permalink" href="#r"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
<var class="Ar">repository-path</var>] <var class="Ar">object1</var>
<var class="Ar">object2</var></dt>
<dd>Display the differences between two objects in the repository. Treat each
- of the two arguments 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
+ of the two arguments as a reference, a tag name, an object ID SHA1 hash,
+ or a keyword 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.
+ automatically, provided the abbreviation is unique. The keywords
+ ":base" and ":head" resolve to the work tree's base
+ commit and branch head, respectively. The former is only valid if invoked
+ in a work tree, while the latter will resolve to the tip of the work
+ tree's current branch if invoked in a work tree, otherwise it will resolve
+ to the repository's HEAD reference. Keywords and references may be
+ appended with ":+" or ":-" modifiers and an optional
+ integer N to denote the Nth descendant or antecedent by first parent
+ traversal, respectively; for example, <b class="Sy">:head:-2</b> denotes
+ the work tree branch head's 2nd generation ancestor, and
+ <b class="Sy">:base:+4</b> denotes the 4th generation descendant of the
+ work tree's base commit. Similarly, <b class="Sy">foobar:+3</b> will
+ denote the 3rd generation descendant of the commit resolved by the
+ "foobar" reference. A ":+" or ":-" modifier
+ without a trailing integer has an implicit "1" appended (e.g.,
+ <b class="Sy">:base:+</b> is equivalent to <b class="Sy">:base:+1</b>).
<p class="Pp">The key bindings for <code class="Cm">tog diff</code> are as
follows (N denotes optional prefixed count modifier):</p>
<dl class="Bl-tag">
<dt id="c~3"><a class="permalink" href="#c~3"><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 the name of a
- branch or a commit ID SHA1 hash. An abbreviated hash argument will be
- expanded to a full SHA1 hash automatically, provided the abbreviation
- is unique.</dd>
+ <var class="Ar">commit</var>. The expected argument is a commit ID
+ SHA1 hash, or a reference name or keyword 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. The
+ keywords ":base" and ":head" resolve to the work
+ tree's base commit and branch head, respectively. The former is only
+ valid if invoked in a work tree, while the latter will resolve to the
+ tip of the work tree's current branch if invoked in a work tree,
+ otherwise it will resolve to the repository's HEAD reference. Keywords
+ and references may be appended with ":+" or ":-"
+ modifiers and an optional integer N to denote the Nth descendant or
+ antecedent by first parent traversal, respectively; for example,
+ <b class="Sy">:head:-2</b> denotes the work tree branch head's 2nd
+ generation ancestor, and <b class="Sy">:base:+4</b> denotes the 4th
+ generation descendant of the work tree's base commit. Similarly,
+ <b class="Sy">foobar:+3</b> will denote the 3rd generation descendant
+ of the commit resolved by the "foobar" reference. A
+ ":+" or ":-" modifier without a trailing integer
+ has an implicit "1" appended (e.g.,
+ <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</dd>
<dt id="r~3"><a class="permalink" href="#r~3"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
<dt id="c~4"><a class="permalink" href="#c~4"><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 the name of a
- branch or a commit ID SHA1 hash. An abbreviated hash argument will be
- expanded to a full SHA1 hash automatically, provided the abbreviation
- is unique.</dd>
+ <var class="Ar">commit</var>. The expected argument is a commit ID
+ SHA1 hash, or a reference name or keyword 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. The
+ keywords ":base" and ":head" resolve to the work
+ tree's base commit and branch head, respectively. The former is only
+ valid if invoked in a work tree, while the latter will resolve to the
+ tip of the work tree's current branch if invoked in a work tree,
+ otherwise it will resolve to the repository's HEAD reference. Keywords
+ and references may be appended with ":+" or ":-"
+ modifiers and an optional integer N to denote the Nth descendant or
+ antecedent by first parent traversal, respectively; for example,
+ <b class="Sy">:head:-2</b> denotes the work tree branch head's 2nd
+ generation ancestor, and <b class="Sy">:base:+4</b> denotes the 4th
+ generation descendant of the work tree's base commit. Similarly,
+ <b class="Sy">foobar:+3</b> will denote the 3rd generation descendant
+ of the commit resolved by the "foobar" reference. A
+ ":+" or ":-" modifier without a trailing integer
+ has an implicit "1" appended (e.g.,
+ <b class="Sy">:base:+</b> is equivalent to
+ <b class="Sy">:base:+1</b>).</dd>
<dt id="r~4"><a class="permalink" href="#r~4"><code class="Fl">-r</code></a>
<var class="Ar">repository-path</var></dt>
<dd>Use the repository at the specified path. If not specified, assume the
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">June 23,
+ line"><span class="foot-left"></span><span class="foot-date">July 19,
2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
</body>
</html>
