commit - 9ce6226dca832c8fe930498a19bc3d7b457bc213
commit + b183145b65deab64768d0fcab787025a68b43679
blob - 33402467928cd5f681df651e315b79a2b0c5116a
blob + 67184c461579ade5363aa4f17fac8478553935c3
--- git-repository.5.html
+++ git-repository.5.html
commit object. Tag objects also contain a tag message, as well as author
and timestamp information.</dd>
</dl>
-<p class="Pp">Each object is identified by a SHA1 hash calculated over both the
- object's header and the data stored in the object.</p>
+<p class="Pp">Each object is identified by an hash calculated over both the
+ object's header and the data stored in the object. The hashing algorithm
+ used is specified in the repository <span class="Pa">config</span> file for
+ newer repositories while older ones use SHA1 implicitly.</p>
</section>
<section class="Sh">
<h2 class="Sh" id="OBJECT_STORAGE"><a class="permalink" href="#OBJECT_STORAGE">OBJECT
file.</dd>
<dt>Reference Delta Objects</dt>
<dd>This object is represented as a delta against another object in the same
- pack file. The other object is referred to by its SHA1 object
- identifier.</dd>
+ pack file. The other object is referred to by its object identifier.</dd>
</dl>
<p class="Pp">Pack files are self-contained and may not refer to loose objects
or objects stored in other pack files. Deltified objects may refer to other
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 34e67c4d5c027696e90f22ee601c131627e5cf39
blob + df887d569f16159279ffa36be4e83690a1c2fdb5
--- 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">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 554c67cdf08ce1330d039b09db95636e73212bed
blob + ab3930be32d497ecbca8bb88d8cf9e3a7677680a
--- got-worktree.5.html
+++ got-worktree.5.html
versioned files are checked out into the work tree, the current
<a class="Xr" aria-label="umask, section 2">umask(2)</a> is heeded.</dd>
<dt>Blob object ID</dt>
- <dd>The SHA1 hash of the blob object which corresponds to the contents of this
- file in the repository. The hash is stored as binary data.</dd>
+ <dd>The hash of the blob object which corresponds to the contents of this file
+ in the repository. The hash is stored as binary data. The size of the hash
+ depends on the hashing algorithm used in the repository.</dd>
<dt>Commit object ID</dt>
- <dd>The SHA1 hash of the commit object the file was checked out from. The hash
- is stored as binary data. This data is used to detect past incomplete
- update operations. Entries which do not match the work tree's base commit
- may still need to be updated to match file content stored in the base
- commit.</dd>
+ <dd>The hash of the commit object the file was checked out from. The hash is
+ stored as binary data. This data is used to detect past incomplete update
+ operations. Entries which do not match the work tree's base commit may
+ still need to be updated to match file content stored in the base
+ commit.</dd>
<dt>Flags</dt>
<dd>This field contains the length, according to
<a class="Xr" aria-label="strlen, section 3">strlen(3)</a>, of path data
<dd>The path of the entry, relative to the work tree root. Path data is of
variable length and NUL-padded to a multiple of 8 bytes.</dd>
<dt>Staged blob object ID</dt>
- <dd>The SHA1 hash of a blob object containing file content which has been
- staged for commit. The hash is stored as binary data. Only present if a
- file addition or modification has been staged with <code class="Cm">got
+ <dd>The hash of a blob object containing file content which has been staged
+ for commit. The hash is stored as binary data. Only present if a file
+ addition or modification has been staged with <code class="Cm">got
stage</code>.</dd>
</dl>
<p class="Pp">A corrupt or missing file index can be recreated on demand as
<dt><span class="Pa">.got</span></dt>
<dd>Meta-data directory where all files listed below reside.</dd>
<dt><span class="Pa">base-commit</span></dt>
- <dd>SHA1 hex-string representation of the current base commit.</dd>
+ <dd>hash digest hex-string representation of the current base commit.</dd>
<dt><span class="Pa">file-index</span></dt>
<dd>File status information.</dd>
<dt><span class="Pa">format</span></dt>
<a class="Xr" aria-label="rename, section 2">rename(2)</a>,
<a class="Xr" aria-label="stat, section 2">stat(2)</a>,
<a class="Xr" aria-label="umask, section 2">umask(2)</a>,
- <a class="Xr" aria-label="lockf, section 3">lockf(3)</a>,
+ <a class="Xr" aria-label="flock, section 3">flock(3)</a>,
<a class="Xr" aria-label="git-repository, section 5">git-repository(5)</a>,
<a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a></p>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - d22d7b47c66886721e929bb2af617e6c4cee32c1
blob + 0a79cf06575e50a73dae80b876db41afaa617642
--- got.1.html
+++ got.1.html
<p class="Pp">The commands for <code class="Nm">got</code> are as follows:</p>
<dl class="Bl-tag">
<dt id="init"><a class="permalink" href="#init"><code class="Cm">init</code></a>
+ [<code class="Fl">-A</code> <var class="Ar">hashing-algorithm</var>]
[<code class="Fl">-b</code> <var class="Ar">branch</var>]
<var class="Ar">repository-path</var></dt>
<dd>Create a new empty repository at the specified
<p class="Pp">The options for <code class="Cm">got init</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="A"><a class="permalink" href="#A"><code class="Fl">-A</code></a>
+ <var class="Ar">hashing-algorithm</var></dt>
+ <dd>Configure the repository's <var class="Ar">hashing-algorithm</var>
+ used for the computation of Git object IDs. Possible values are
+ <code class="Cm">sha1</code> (the default) or
+ <code class="Cm">sha256</code>.</dd>
<dt id="b"><a class="permalink" href="#b"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Make the repository's HEAD reference point to the specified
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,
+ commit ID, 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 commit ID 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
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>
+ commit ID, 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 commit ID 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>
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
+ argument is a commit ID, 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 commit ID 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
<dt id="S~2"><a class="permalink" href="#S~2"><code class="Fl">-S</code></a>
<var class="Ar">search-pattern</var></dt>
<dd>If specified, show only commits with a log message, author name,
- committer name, or ID SHA1 hash matched by the extended regular
+ committer name, or commit ID matched by the extended regular
expression <var class="Ar">search-pattern</var>. Lines in committed
patches will be matched if <code class="Fl">-p</code> is specified.
File paths changed by a commit will be matched if
<dd>Stop traversing commit history immediately after the specified
<var class="Ar">commit</var> has been traversed. Like
<code class="Fl">-c</code>, 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. This option has no effect if
- the specified <var class="Ar">commit</var> is never traversed.</dd>
+ argument is a commit ID, or a reference name or a keyword which will
+ be resolved to a commit ID. This option has no effect if the specified
+ <var class="Ar">commit</var> is never traversed.</dd>
</dl>
</dd>
<dt id="di"><a class="permalink" href="#diff"><code class="Cm" id="diff">diff</code></a>
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. 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>
+ reference, a tag name, or an object ID, 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 commit ID automatically, provided the 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">
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
+ argument is a commit ID, 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 commit ID 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
<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
- 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 ":-"
+ <var class="Ar">commit</var>. The expected argument is a commit ID, 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 commit ID
+ 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
<var class="Ar">commit</var></dt>
<dd>List files and directories as they appear in the specified
<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,
+ <p class="Pp" id="spam:-3">The expected argument is a commit ID, 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 commit ID
+ 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
the specified <var class="Ar">name</var> will point at the specified
<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
+ argument is an object ID 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 commit ID 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
<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 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 ":-"
+ <var class="Ar">commit</var>. The expected argument is a commit ID, or
+ a reference name or keyword which will be resolved to a commit ID. An
+ abbreviated hash argument will be expanded to a full commit ID
+ 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
<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 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,
+ <var class="Ar">commit</var> argument is a commit ID, or a reference
+ or keyword which will be resolved to a commit ID. An abbreviated hash
+ argument will be expanded to a full commit ID 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,
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
+ argument is a commit ID, 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 commit ID 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
<p class="Pp">The options for <code class="Cm">got commit</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="A"><a class="permalink" href="#A"><code class="Fl">-A</code></a>
+ <dt id="A~2"><a class="permalink" href="#A~2"><code class="Fl">-A</code></a>
<var class="Ar">author</var></dt>
<dd>Set author information in the newly created commit to
<var class="Ar">author</var>. This is useful when committing changes
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.
- <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
+ <p class="Pp" id="barbaz:+3">The expected argument is a commit ID, or a
+ reference name or keyword which will be resolved to a commit ID. An
+ abbreviated hash argument will be expanded to a full commit ID
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
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.
- <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
+ <p class="Pp" id="wip:+5">The expected argument is a commit ID, or a
+ reference name or keyword which will be resolved to a commit ID. An
+ abbreviated hash argument will be expanded to a full commit ID
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
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
- hash. Any remaining text on the line is ignored. Lines which begin with
- the ‘#’ character are ignored entirely.</p>
+ argument. For most commands, the expected argument is a commit ID. Any
+ remaining text on the line is ignored. Lines which begin with the
+ ‘#’ character are ignored entirely.</p>
<p class="Pp">The available histedit script commands are as follows:</p>
<table class="Bl-column">
<tr id="pick">
similar to the actual content stored in such objects. Blob object contents
are printed as they would appear in files on disk.
<p class="Pp">Attempt to interpret each argument as a reference, a tag name,
- or an object ID SHA1 hash. References will be resolved to an object ID.
- Tag names will resolved to a tag object. An abbreviated hash argument
- will be expanded to a full SHA1 hash automatically, provided the
- abbreviation is unique.</p>
+ or an object ID. References will be resolved to an object ID. Tag names
+ will resolved to a tag object. An abbreviated hash argument will be
+ expanded to a full commit ID automatically, provided the abbreviation is
+ unique.</p>
<p class="Pp">If none of the above interpretations produce a valid result,
or if the <code class="Fl">-P</code> option is used, attempt to
interpret the argument as a path which will be resolved to the ID of an
<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.
- <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,
+ <p class="Pp" id="quux:-8">The expected argument is a commit ID, or a
+ reference name or keyword which will be resolved to a commit ID. An
+ abbreviated hash argument will be expanded to a full commit ID
+ 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
<br/>
<span class="An">Christian Weisgerber</span>
<<a class="Mt" href="mailto:naddy@openbsd.org">naddy@openbsd.org</a>>
+ <br/>
+ <span class="An">Florian Obser</span>
+ <<a class="Mt" href="mailto:florian@narrans.de">florian@narrans.de</a>>
<br/>
<span class="An">Hiltjo Posthuma</span>
<<a class="Mt" href="mailto:hiltjo@codemadness.org">hiltjo@codemadness.org</a>>
+ <br/>
+ <span class="An">James Cook</span>
+ <<a class="Mt" href="mailto:falsifian@falsifian.org">falsifian@falsifian.org</a>>
+ <br/>
+ <span class="An">Jasper Lievisse Adriaanse</span>
+ <<a class="Mt" href="mailto:j@jasper.la">j@jasper.la</a>>
<br/>
<span class="An">Josh Rickmar</span>
<<a class="Mt" href="mailto:jrick@zettaport.com">jrick@zettaport.com</a>>
<span class="An">Joshua Stein</span>
<<a class="Mt" href="mailto:jcs@openbsd.org">jcs@openbsd.org</a>>
<br/>
+ <span class="An">Josiah Frentsos</span>
+ <<a class="Mt" href="mailto:jfrent@tilde.team">jfrent@tilde.team</a>>
+ <br/>
<span class="An">Klemens Nanni</span>
<<a class="Mt" href="mailto:kn@openbsd.org">kn@openbsd.org</a>>
<br/>
+ <span class="An">Kyle Ackerman</span>
+ <<a class="Mt" href="mailto:kackerman0102@gmail.com">kackerman0102@gmail.com</a>>
+ <br/>
+ <span class="An">Lorenz (xha)</span>
+ <<a class="Mt" href="mailto:me@xha.li">me@xha.li</a>>
+ <br/>
+ <span class="An">Lucas Gabriel Vuotto</span>
+ <<a class="Mt" href="mailto:lucas@sexy.is">lucas@sexy.is</a>>
+ <br/>
+ <span class="An">Mark Jamsek</span>
+ <<a class="Mt" href="mailto:mark@jamsek.dev">mark@jamsek.dev</a>>
+ <br/>
<span class="An">Martin Pieuchot</span>
<<a class="Mt" href="mailto:mpi@openbsd.org">mpi@openbsd.org</a>>
<br/>
+ <span class="An">Mikhail Pchelin</span>
+ <<a class="Mt" href="mailto:misha@freebsd.org">misha@freebsd.org</a>>
+ <br/>
<span class="An">Neels Hofmeyr</span>
<<a class="Mt" href="mailto:neels@hofmeyr.de">neels@hofmeyr.de</a>>
<br/>
<span class="An">Steven McDonald</span>
<<a class="Mt" href="mailto:steven@steven-mcdonald.id.au">steven@steven-mcdonald.id.au</a>>
<br/>
+ <span class="An">Ted Unangst</span>
+ <<a class="Mt" href="mailto:tedu@tedunangst.com">tedu@tedunangst.com</a>>
+ <br/>
<span class="An">Theo Buehler</span>
<<a class="Mt" href="mailto:tb@openbsd.org">tb@openbsd.org</a>>
<br/>
<span class="An">Thomas Adam</span>
<<a class="Mt" href="mailto:thomas@xteddy.org">thomas@xteddy.org</a>>
<br/>
+ <span class="An">Tobias Heider</span>
+ <<a class="Mt" href="mailto:me@tobhe.de">me@tobhe.de</a>>
+ <br/>
+ <span class="An">Tom Jones</span>
+ <<a class="Mt" href="mailto:thj@freebsd.org">thj@freebsd.org</a>>
+ <br/>
<span class="An">Tracey Emery</span>
<<a class="Mt" href="mailto:tracey@traceyemery.net">tracey@traceyemery.net</a>>
<br/>
<span class="An">Yang Zhong</span>
<<a class="Mt" href="mailto:yzhong@freebsdfoundation.org">yzhong@freebsdfoundation.org</a>></p>
<p class="Pp">Parts of <code class="Nm">got</code>,
- <a class="Xr" aria-label="tog, section 1">tog(1)</a>, and
+ <a class="Xr" aria-label="tog, section 1">tog(1)</a>,
+ <a class="Xr" aria-label="gotd, section 8">gotd(8)</a>, and
<a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a> were derived
from code under copyright by:</p>
<p class="Pp">
<br/>
+ <span class="An">Bjoern Hoehrmann</span>
+ <br/>
<span class="An">Caldera International</span>
<br/>
<span class="An">Daniel Hartmeier</span>
<br/>
+ <span class="An">David Gwynne</span>
+ <br/>
<span class="An">Esben Norby</span>
<br/>
+ <span class="An">Florian Obser</span>
+ <br/>
<span class="An">Henning Brauer</span>
<br/>
<span class="An">Håkan Olsson</span>
<br/>
<span class="An">Jean-Francois Brousseau</span>
<br/>
+ <span class="An">Jerome Kasper</span>
+ <br/>
<span class="An">Joris Vink</span>
<br/>
<span class="An">Jyri J. Virkki</span>
<br/>
<span class="An">Markus Friedl</span>
<br/>
+ <span class="An">Mike Larkin</span>
+ <br/>
<span class="An">Niall O'Higgins</span>
<br/>
<span class="An">Niklas Hallqvist</span>
<br/>
<span class="An">Ray Lai</span>
<br/>
+ <span class="An">Reyk Floeter</span>
+ <br/>
<span class="An">Ryan McBride</span>
<br/>
+ <span class="An">Ted Unangst</span>
+ <br/>
<span class="An">Theo de Raadt</span>
<br/>
<span class="An">Todd C. Miller</span>
<a class="Xr" aria-label="git, section 1">git(1)</a> to perform some tasks.
In particular:</p>
<ul class="Bl-bullet">
+ <li>With repositories that use the sha256 object ID hashing algorithm,
+ <a class="Xr" aria-label="git, section 1">git(1)</a> is currently required
+ for all network operations (clone, fetch, and push) because
+ <code class="Nm">got</code> does not yet support version 2 of the Git
+ network protocol.</li>
<li>Writing to remote repositories over HTTP or HTTPS protocols requires
<a class="Xr" aria-label="git-push, section 1">git-push(1)</a>.</li>
<li>The creation of merge commits with more than two parent commits requires
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 159c4caa20ea550daa5d294b674da6e4e43eabae
blob + 0fa58670e2aaa224bc744d20d54afe8622b3cea7
--- got.conf.5.html
+++ got.conf.5.html
repository-wide settings for <a class="Xr" aria-label="got, section
1">got(1)</a> commands executed within this work tree.</p>
<p class="Pp">The file format is line-based, with one configuration directive
- per line. Any lines beginning with a ‘#’ are treated as
- comments and ignored.</p>
+ per line. Comments can be put anywhere in the file using a hash mark
+ (‘#’), and extend to the end of the current line. Arguments
+ names not beginning with a letter, digit or underscore, as well as reserved
+ words (such as <code class="Ic">author</code>,
+ <code class="Ic">remote</code> <span class="No">or</span>
+ <code class="Ic">port</code>), must be quoted. Arguments containing
+ whitespace should be surrounded by double quotes (").</p>
<p class="Pp">The available configuration directives are as follows:</p>
<dl class="Bl-tag">
<dt id="author"><a class="permalink" href="#author"><code class="Ic">author</code></a>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 6be5c4775583e647af61903fabeff9a412f84ba3
blob + d19b0b1fa9363a73ca04e1f89daac9ee6183589b
--- gotadmin.1.html
+++ gotadmin.1.html
follows:</p>
<dl class="Bl-tag">
<dt id="init"><a class="permalink" href="#init"><code class="Cm">init</code></a>
+ [<code class="Fl">-A</code> <var class="Ar">hashing-algorithm</var>]
[<code class="Fl">-b</code> <var class="Ar">branch</var>]
<var class="Ar">repository-path</var></dt>
<dd>Create a new empty repository at the specified
<p class="Pp">The options for <code class="Cm">gotadmin init</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt id="A"><a class="permalink" href="#A"><code class="Fl">-A</code></a>
+ <var class="Ar">hashing-algorithm</var></dt>
+ <dd>Configure the repository's <var class="Ar">hashing-algorithm</var>
+ used for the computation of Git object IDs. Possible values are
+ <code class="Cm">sha1</code> (the default) or
+ <code class="Cm">sha256</code>.</dd>
<dt id="b"><a class="permalink" href="#b"><code class="Fl">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Make the repository's HEAD reference point to the specified
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]</dt>
<dd>Display information about a repository. This includes some configuration
settings from <a class="Xr" aria-label="got.conf, section
- 5">got.conf(5)</a>, and the number of objects stored in the repository, in
- packed or loose form, as well as the current on-disk size of these
- objects.
+ 5">got.conf(5)</a>, the object ID hashing algorithm, and the number of
+ objects stored in the repository, in packed or loose form, as well as the
+ current on-disk size of these objects.
<p class="Pp">The options for <code class="Cm">gotadmin info</code> are as
follows:</p>
<dl class="Bl-tag">
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - d1b4282bccc355c677c776a497a2a7bc46d71870
blob + 299cb470f66fcfa85ab79428dfded30a51e23b32
--- 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">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - b8a17e1a6b9ea91e01e65eae2d47e825fbc176df
blob + 00ac07931cfd6e6f0ac567d23b85704c67564316
--- gotd.8.html
+++ gotd.8.html
<p class="Pp"><span class="An">Stefan Sperling</span>
<<a class="Mt" href="mailto:stsp@openbsd.org">stsp@openbsd.org</a>></p>
</section>
+<section class="Sh">
+<h2 class="Sh" id="CAVEATS"><a class="permalink" href="#CAVEATS">CAVEATS</a></h2>
+<p class="Pp">At present, <code class="Nm">gotd</code> cannot serve repositories
+ that use the sha256 object ID hashing algorithm because
+ <code class="Nm">gotd</code> does not yet support version 2 of the Git
+ network protocol.</p>
+</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 660c7d4d20710a90bd60e13597c907b7a0040e29
blob + 54a84d085d90ab56faf623ce1243c92c888ef5c2
--- gotd.conf.5.html
+++ gotd.conf.5.html
<p class="Pp"><code class="Nm">gotd.conf</code> is the run-time configuration
file for <a class="Xr" aria-label="gotd, section 8">gotd(8)</a>.</p>
<p class="Pp">The file format is line-based, with one configuration directive
- per line. Any lines beginning with a ‘#’ are treated as
- comments and ignored.</p>
+ per line. Comments can be put anywhere in the file using a hash mark
+ (‘#’), and extend to the end of the current line. Arguments
+ names not beginning with a letter, digit or underscore, as well as reserved
+ words (such as <code class="Ic">listen</code>,
+ <code class="Ic">repository</code> <span class="No">or</span>
+ <code class="Ic">user</code>), must be quoted. Arguments containing
+ whitespace should be surrounded by double quotes (").</p>
</section>
<section class="Sh">
<h2 class="Sh" id="GLOBAL_CONFIGURATION"><a class="permalink" href="#GLOBAL_CONFIGURATION">GLOBAL
privileges in order to create its unix socket. Afterwards,
<a class="Xr" aria-label="gotd, section 8">gotd(8)</a> drops privileges to
the specified <var class="Ar">user</var>. If not specified, the user _gotd
- will be used.</dd>
+ will be used. Numeric user IDs are also accepted.</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">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - cf37dd61dbe68e8ab12c00d2414189c6e165c23e
blob + d8be79134153495c16b4f68121a60f4a9a8c60fa
--- 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">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - d2605f8aaac25a7b68b23d396df84779a3de251a
blob + ce821ea610009f53d0563fada6bc0547abefe814
--- 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">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - e08c9947c6c05d51a11f085a893c41946b1cf4a3
blob + 632578648df57a231351bf6f968d1d59055d1069
--- gotwebd.conf.5.html
+++ gotwebd.conf.5.html
<p class="Pp"><code class="Nm">gotwebd.conf</code> is the run-time configuration
file for <a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a>.</p>
<p class="Pp">The file format is line-based, with one configuration directive
- per line. Any lines beginning with a ‘#’ are treated as
- comments and ignored.</p>
+ per line. Comments can be put anywhere in the file using a hash mark
+ (‘#’), and extend to the end of the current line. Arguments
+ names not beginning with a letter, digit or underscore, as well as reserved
+ words (such as <code class="Ic">listen</code>,
+ <code class="Ic">server</code> <span class="No">or</span>
+ <code class="Ic">user</code>), must be quoted. Arguments containing
+ whitespace should be surrounded by double quotes (").</p>
<p class="Pp">Macros can be defined that are later expanded in context. Macro
names must start with a letter, digit, or underscore, and may contain any of
those characters, but may not be reserved words. Macros are not expanded
updated with an appropriate description.</dd>
<dt id="show_repo_owner"><a class="permalink" href="#show_repo_owner"><code class="Ic">show_repo_owner</code></a>
<var class="Ar">on</var> | <var class="Ar">off</var></dt>
- <dd>Set whether to display the repository owner. Enabled by default.
- Displaying the owner requires owner information to be added to the
- <span class="Pa">config</span> file in the repository.
- <a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a> will parse
- owner information from either a [gotweb] or a [gitweb] section. For
- example:
+ <dd>Set whether to display the repository owner. Enabled by default. This
+ requires the creation of an <span class="Pa">owner</span> file in the
+ repository or adding an ‘owner’ field under the [gotweb] or
+ [gitweb] section in the <span class="Pa">config</span> file inside the
+ repository. For example:
<div class="Bd Pp Bd-indent Li">
<pre>[gotweb]
owner = "Your Name"</pre>
</div>
+ <p class="Pp">The <span class="Pa">owner</span> file has priority over the
+ <span class="Pa">config</span> if present.</p>
</dd>
<dt id="site_link"><a class="permalink" href="#site_link"><code class="Ic">site_link</code></a>
<var class="Ar">string</var></dt>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 395d1c936bc0a81628dc590d71e8d6f802666f81
blob + fd6a14dfc48b642b524a64a19c5546ef6667ea62
--- tog.1.html
+++ tog.1.html
<dd>Like <code class="Cm">g</code> but defaults to the oldest commit.</dd>
<dt id="Enter"><a class="permalink" href="#Enter"><code class="Cm">Enter</code></a></dt>
<dd>Open a <code class="Cm">diff</code> view showing file changes made in
- the currently selected commit.</dd>
+ the currently selected commit. If a commit is marked with the
+ <code class="Cm">m</code> key map, open a diff view showing file
+ changes made between the marked commit and the currently selected
+ commit.</dd>
+ <dt id="m"><a class="permalink" href="#m"><code class="Cm">m</code></a></dt>
+ <dd>Mark or unmark the selected commit. When a commit is marked, pressing
+ the <code class="Cm">enter</code> key on another selected commit opens
+ a <code class="Cm">diff</code> view showing the changes between the
+ marked commit and the currently selected commit.</dd>
<dt id="T"><a class="permalink" href="#T"><code class="Cm">T</code></a></dt>
<dd>Open a <code class="Cm">tree</code> view showing the tree for the
currently selected commit.</dd>
<dd>Prompt for a search pattern and start searching for matching commits.
The search pattern is an extended regular expression which is matched
against a commit's author name, committer name, log message, and
- commit ID SHA1 hash. Regular expression syntax is documented in
+ commit ID. Regular expression syntax is documented in
<a class="Xr" aria-label="re_format, section 7">re_format(7)</a>.</dd>
<dt id="&"><a class="permalink" href="#&"><code class="Cm">&</code></a></dt>
<dd>Prompt for a pattern and limit the log view's list of commits to those
with <code class="Cm">/</code> will search the limited list of
commits, rather than searching all commits. The pattern is an extended
regular expression which is matched against a commit's author name,
- committer name, log message, and commit ID SHA1 hash. Regular
- expression syntax is documented in
- <a class="Xr" aria-label="re_format, section 7">re_format(7)</a>.</dd>
+ committer name, log message, and commit ID. Regular expression syntax
+ is documented in <a class="Xr" aria-label="re_format, section
+ 7">re_format(7)</a>.</dd>
<dt id="n"><a class="permalink" href="#n"><code class="Cm">n</code></a></dt>
<dd>Find the Nth next commit which matches the current search pattern
(default: 1).
<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 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 ":-"
+ <var class="Ar">commit</var>. The expected argument is a commit ID, or
+ a reference name or keyword which will be resolved to a commit ID. An
+ abbreviated hash argument will be expanded to a full commit ID
+ 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
<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, 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
+ of the two arguments as a reference, a tag name, an object ID, 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 commit ID
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
<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 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 ":-"
+ <var class="Ar">commit</var>. The expected argument is a commit ID, or
+ a reference name or keyword which will be resolved to a commit ID. An
+ abbreviated hash argument will be expanded to a full commit ID
+ 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
<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 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 ":-"
+ <var class="Ar">commit</var>. The expected argument is a commit ID, or
+ a reference name or keyword which will be resolved to a commit ID. An
+ abbreviated hash argument will be expanded to a full commit ID
+ 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
<dt id="i~2"><a class="permalink" href="#i~2"><code class="Cm">i</code></a></dt>
<dd>Show object IDs for all non-symbolic references displayed in the
<code class="Cm">ref</code> view.</dd>
- <dt id="m"><a class="permalink" href="#m"><code class="Cm">m</code></a></dt>
+ <dt id="m~2"><a class="permalink" href="#m~2"><code class="Cm">m</code></a></dt>
<dd>Show last modified date of each displayed reference.</dd>
<dt id="o"><a class="permalink" href="#o"><code class="Cm">o</code></a></dt>
<dd>Toggle display order of references between sort by name and sort by
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">July 11,
- 2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
+ line"><span class="foot-left"></span><span class="foot-date">August 14,
+ 2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
