commit - 13ab3555c0a8cc4e77df44b1cd27ad1c1da9985c
commit + b6df88e2587e6f6d323c5afbb639d23a3c38ff5f
blob - 7d9eceaa69beb444cf859be1b18da0c8e1525528
blob + 68bc0dbac992e82e81446f8a947474fb8af01cf8
--- git-repository.5.html
+++ git-repository.5.html
<dl class="Bl-tag Bl-compact">
<dt><span class="Pa">HEAD</span></dt>
<dd>A reference to the current head commit of the Git work tree. In bare
- repositories, this files serves as a default reference.</dd>
+ repositories, this file serves as a default reference.</dd>
<dt><span class="Pa">ORIG_HEAD</span></dt>
<dd>Reference to original head commit. Set by some Git operations.</dd>
<dt><span class="Pa">FETCH_HEAD</span></dt>
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 460f1d82db7a084d40b75d48137de3a78a9efbbc
blob + aa58d04aab8c75861ec96ec89f8b6daf07f4a906
--- 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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - a537c3d7ba9e88ef256b8f87d22076bb9acbfb2e
blob + 7cfa986b4794cf310f0aedda5949976a3919f39c
--- 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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 79ce46d5377bea5c2eb56107a41166b239fac03b
blob + 7d53b06b795b1633ba6dc76c6f5dd02959e3c086
--- got.1.html
+++ got.1.html
</dd>
<dt id="cl"><a class="permalink" href="#clone"><code class="Cm" id="clone">clone</code></a>
[<code class="Fl">-almqv</code>] [<code class="Fl">-b</code>
- <var class="Ar">branch</var>] [<code class="Fl">-R</code>
+ <var class="Ar">branch</var>] [<code class="Fl">-J</code>
+ <var class="Ar">jumphost</var>] [<code class="Fl">-R</code>
<var class="Ar">reference</var>] <var class="Ar">repository-URL</var>
[<var class="Ar">directory</var>]</dt>
<dd>
not specified, a branch resolved via the remote repository's HEAD
reference will be fetched. Cannot be used together with the
<code class="Fl">-a</code> option.</dd>
+ <dt id="J"><a class="permalink" href="#J"><code class="Fl">-J</code></a>
+ <var class="Ar">jumphost</var></dt>
+ <dd>Specify a <var class="Ar">jumphost</var> to use with SSH connections.
+ The same option will be passed to <a class="Xr" aria-label="ssh,
+ section 1">ssh(1)</a>.</dd>
<dt id="l"><a class="permalink" href="#l"><code class="Fl">-l</code></a></dt>
<dd>List branches and tags available for fetching from the remote
repository and exit immediately. Cannot be used together with any of
</dd>
<dt id="fe"><a class="permalink" href="#fetch"><code class="Cm" id="fetch">fetch</code></a>
[<code class="Fl">-adlqtvX</code>] [<code class="Fl">-b</code>
- <var class="Ar">branch</var>] [<code class="Fl">-R</code>
+ <var class="Ar">branch</var>] [<code class="Fl">-J</code>
+ <var class="Ar">jumphost</var>] [<code class="Fl">-R</code>
<var class="Ar">reference</var>] [<code class="Fl">-r</code>
<var class="Ar">repository-path</var>]
[<var class="Ar">remote-repository</var>]</dt>
commit, tree, tag, and blob objects belonging to deleted branches or
tags remain in the repository and may be removed separately with Git's
garbage collector or <code class="Cm">gotadmin cleanup</code>.</dd>
+ <dt id="J~2"><a class="permalink" href="#J~2"><code class="Fl">-J</code></a>
+ <var class="Ar">jumphost</var></dt>
+ <dd>Specify a <var class="Ar">jumphost</var> to use with SSH connections.
+ The same option will be passed to <a class="Xr" aria-label="ssh,
+ section 1">ssh(1)</a>.</dd>
<dt id="l~2"><a class="permalink" href="#l~2"><code class="Fl">-l</code></a></dt>
<dd>List branches and tags available for fetching from the remote
repository and exit immediately. Cannot be used together with any of
</dl>
</dd>
<dt id="tag"><a class="permalink" href="#tag"><code class="Cm">tag</code></a>
- [<code class="Fl">-lVv</code>] [<code class="Fl">-c</code>
+ [<code class="Fl">-lsVv</code>] [<code class="Fl">-c</code>
<var class="Ar">commit</var>] [<code class="Fl">-m</code>
<var class="Ar">message</var>] [<code class="Fl">-r</code>
- <var class="Ar">repository-path</var>] [<code class="Fl">-s</code>
+ <var class="Ar">repository-path</var>] [<code class="Fl">-S</code>
<var class="Ar">signer-id</var>] <var class="Ar">name</var></dt>
<dd>Manage tags in a repository.
<p class="Pp">Tags are managed via references which live in the
repository is located at or above the current working directory. If
this directory is a <code class="Nm">got</code> work tree, use the
repository path associated with this work tree.</dd>
- <dt id="s~5"><a class="permalink" href="#s~5"><code class="Fl">-s</code></a>
+ <dt id="S~3"><a class="permalink" href="#S~3"><code class="Fl">-S</code></a>
<var class="Ar">signer-id</var></dt>
<dd>While creating a new tag, sign this tag with the identity given in
<var class="Ar">signer-id</var>.
compatibility with <a class="Xr" aria-label="git, section
1">git(1)</a>.</p>
</dd>
+ <dt id="s~5"><a class="permalink" href="#s~5"><code class="Fl">-s</code></a></dt>
+ <dd>Display a short one-line summary of each tag, instead of the default
+ history format. Can only be used with the <code class="Fl">-l</code>
+ option.</dd>
<dt id="V~2"><a class="permalink" href="#V~2"><code class="Fl">-V</code></a></dt>
<dd>Verify tag object signatures. If a <var class="Ar">name</var> is
specified, show and verify the tag object with the provided name.
<dd>This option prevents <code class="Cm">got commit</code> from
generating a diff of the to-be-committed changes in a temporary file
which can be viewed while editing a commit message.</dd>
- <dt id="S~3"><a class="permalink" href="#S~3"><code class="Fl">-S</code></a></dt>
+ <dt id="S~4"><a class="permalink" href="#S~4"><code class="Fl">-S</code></a></dt>
<dd>Allow the addition of symbolic links which point outside of the path
space that is under version control. By default, <code class="Cm">got
commit</code> will reject such symbolic links due to safety concerns.
<dt id="se"><a class="permalink" href="#send"><code class="Cm" id="send">send</code></a>
[<code class="Fl">-afqTv</code>] [<code class="Fl">-b</code>
<var class="Ar">branch</var>] [<code class="Fl">-d</code>
- <var class="Ar">branch</var>] [<code class="Fl">-r</code>
+ <var class="Ar">branch</var>] [<code class="Fl">-J</code>
+ <var class="Ar">jumphost</var>] [<code class="Fl">-r</code>
<var class="Ar">repository-path</var>] [<code class="Fl">-t</code>
<var class="Ar">tag</var>] [<var class="Ar">remote-repository</var>]</dt>
<dd>
risks of creating inconsistencies between different repositories
should also be taken into account.</p>
</dd>
+ <dt id="J~3"><a class="permalink" href="#J~3"><code class="Fl">-J</code></a>
+ <var class="Ar">jumphost</var></dt>
+ <dd>Specify a <var class="Ar">jumphost</var> to use with SSH connections.
+ The same option will be passed to <a class="Xr" aria-label="ssh,
+ section 1">ssh(1)</a>.</dd>
<dt id="q~5"><a class="permalink" href="#q~5"><code class="Fl">-q</code></a></dt>
<dd>Suppress progress reporting output. The same option will be passed to
<a class="Xr" aria-label="ssh, section 1">ssh(1)</a> if
<var class="Ar">branch</var> into the work tree, show the status of each
affected file, using the following status codes:</p>
<table class="Bl-column">
+ <tr>
+ <td>U</td>
+ <td>file was updated</td>
+ </tr>
<tr>
<td>G</td>
<td>file was merged</td>
individual patches derived from the modified file content can be
staged. Files in added or deleted status may only be staged or
rejected in their entirety.</dd>
- <dt id="S~4"><a class="permalink" href="#S~4"><code class="Fl">-S</code></a></dt>
+ <dt id="S~5"><a class="permalink" href="#S~5"><code class="Fl">-S</code></a></dt>
<dd>Allow staging of symbolic links which point outside of the path space
that is under version control. By default, <code class="Cm">got
stage</code> will reject such symbolic links due to safety concerns.
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 40ef72a3f026a771121c1153fb948ea1d6547f94
blob + 17b97c10ecefab05249dd5277958bfa896c988f7
--- 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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - d0b39159a0a957e57eae98fecd7d93dbad70478c
blob + cb85e190fa489ef0e38cf7790ac6989af799c78e
--- gotadmin.1.html
+++ gotadmin.1.html
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 07fb8a6ecba5c49973fbd178bb98b436c93384ce
blob + 75e217c0599510ce92c4d3a5b655db16dfa2468c
--- 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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 45d240938e4126df60824e43ccc2fd9d0c745a3c
blob + b6d0bf2a1d23c72636c0d80cd15ee4228f2d45d1
--- gotd-secrets.conf.5.html
+++ gotd-secrets.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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 4180bae50794857c7b7a4f79fa10310de9a62607
blob + 9d9489fc8b78dea954a657ac5792f0308cdf6541
--- 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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - b795fe54c5006bbac081a88a42b1c835ecfb3553
blob + caa6b9ea64b3f338687d9e07e0affb143841feaf
--- 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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 23bf42bff2747d14cb10011b068ea38dc4368c7d
blob + 3d1e86a295160e3a589c3dc962231d9d7ccdc2f0
--- 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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - 9a59b707857e6d57240510410f0ad1ad536bfa5d
blob + 1b68233cd9bebc4df5d6c0d8a134213e169e3717
--- 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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - e154b91bb5dd0292515c5bd49e182a76c347d893
blob + 4dfbcebba887e3c733146eb66da1caea9efd901b
--- 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">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
blob - b3a6b212fe6feeb2325c40a3b14b0e7eafc495e4
blob + 3e7faebe8976816f09919e2306469175c44d1343
--- tog.1.html
+++ tog.1.html
initially if no <var class="Ar">command</var> is specified, or if just a
<var class="Ar">path</var> is specified.</dd>
<dt>Diff view</dt>
- <dd>Displays changes made in a particular commit.</dd>
+ <dd>Displays work tree changes or changes made in a particular commit.</dd>
<dt>Blame view</dt>
<dd>Displays the line-by-line history of a file.</dd>
<dt>Tree view</dt>
key is pressed.</dd>
<dt id="Ctrl+l"><a class="permalink" href="#Ctrl+l"><code class="Cm">Ctrl+l</code></a></dt>
<dd>Reload the <code class="Cm">log</code> view with new commits found in
- the repository.</dd>
+ the repository or new work tree changes.</dd>
<dt id="B"><a class="permalink" href="#B"><code class="Cm">B</code></a></dt>
<dd>Reload the <code class="Cm">log</code> view and toggle display of
merged commits. The <code class="Fl">-b</code> option determines
</dl>
</dd>
<dt id="diff"><a class="permalink" href="#diff"><code class="Cm">diff</code></a>
- [<code class="Fl">-aw</code>] [<code class="Fl">-C</code>
- <var class="Ar">number</var>] [<code class="Fl">-r</code>
- <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, 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
- 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>).
+ [<code class="Fl">-asw</code>] [<code class="Fl">-C</code>
+ <var class="Ar">number</var>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<var class="Ar">object1</var>
+ <var class="Ar">object2</var> | <var class="Ar">path ...</var>]</dt>
+ <dd>If invoked within a work tree without any arguments, display all local
+ changes in the work tree. If one or more <var class="Ar">path</var>
+ arguments are specified, only show changes within the specified paths.
+ <p class="Pp">Alternatively, if two object arguments are specified, display
+ the differences between the two objects in the repository. Treat each 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 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>
<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">
<var class="Ar">number</var></dt>
<dd>Set the number of context lines shown in the diff. By default, 3 lines
of context are shown.</dd>
+ <dt id="c~2"><a class="permalink" href="#c~2"><code class="Fl">-c</code></a>
+ <var class="Ar">commit</var></dt>
+ <dd>Show differences between commits in the repository. This option may be
+ used up to two times. When used only once, show differences between
+ the specified <var class="Ar">commit</var> and its first parent
+ commit. When used twice, show differences between the two specified
+ commits.
+ <p class="Pp">The expected argument is a commit ID hash, or an existing
+ reference, tag name, or keyword, which is resolved to a commit ID.
+ Unique abbreviated hash arguments are automatically expanded to a
+ full hash. Both objects must be of the same type (i.e., blobs,
+ trees, or commits).</p>
+ <p class="Pp">If the <code class="Fl">-c</code> option is used, all
+ non-option arguments are interpreted as paths. If one or more such
+ <var class="Ar">path</var> arguments are provided, only show
+ differences for the specified paths.</p>
+ </dd>
<dt id="r~2"><a class="permalink" href="#r~2"><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
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="s"><a class="permalink" href="#s"><code class="Fl">-s</code></a></dt>
+ <dd>Show changes staged with <code class="Cm">got stage</code> instead of
+ showing local changes in the work tree. This option is only valid when
+ <code class="Cm">tog diff</code> is invoked in a work tree with no
+ <code class="Fl">-c</code> options.</dd>
<dt id="w~2"><a class="permalink" href="#w~2"><code class="Fl">-w</code></a></dt>
<dd>Ignore whitespace-only changes.</dd>
</dl>
<dt id="Enter~2"><a class="permalink" href="#Enter~2"><code class="Cm">Enter</code></a></dt>
<dd>Open a <code class="Cm">diff</code> view for the currently selected
line's commit.</dd>
- <dt id="c~2"><a class="permalink" href="#c~2"><code class="Cm">c</code></a></dt>
+ <dt id="c~3"><a class="permalink" href="#c~3"><code class="Cm">c</code></a></dt>
<dd>Reload the <code class="Cm">blame</code> view with the version of the
file as found in the currently selected line's commit.</dd>
<dt id="p~2"><a class="permalink" href="#p~2"><code class="Cm">p</code></a></dt>
<p class="Pp">The options for <code class="Cm">tog blame</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~3"><a class="permalink" href="#c~3"><code class="Fl">-c</code></a>
+ <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, or
<p class="Pp">The options for <code class="Cm">tog tree</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt id="c~4"><a class="permalink" href="#c~4"><code class="Fl">-c</code></a>
+ <dt id="c~5"><a class="permalink" href="#c~5"><code class="Fl">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Start traversing history at the specified
<var class="Ar">commit</var>. The expected argument is a commit ID, or
</section>
</main>
<div class="foot" role="doc-pagefooter" aria-label="Manual footer
- line"><span class="foot-left"></span><span class="foot-date">November 21,
+ line"><span class="foot-left"></span><span class="foot-date">December 28,
2024</span> <span class="foot-os">OpenBSD 7.6</span></div>
</body>
</html>
