commit - 87279caa9694cb39352f15c8f92175411872708a
commit + 8b679b4bf15b84e71c5d2f610692ea08e197d87c
blob - f9f1baacd73e07babd264515c83fb013ab2e3040
blob + ec9606b4475cf810e09b0e9111713756cef444a7
--- git-repository.5.html
+++ git-repository.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 27, 2019</td>
+ <td class="foot-date">February 18, 2020</td>
<td class="foot-os">OpenBSD 6.6</td>
</tr>
</table>
blob - 991e520c14c73dad6fb9211c4b1062bff36e0679
blob + 5f8314ad2defb4b2fea3e186d3a3ecd08c1389c0
--- got-worktree.5.html
+++ got-worktree.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 27, 2019</td>
+ <td class="foot-date">February 18, 2020</td>
<td class="foot-os">OpenBSD 6.6</td>
</tr>
</table>
blob - 0e9bc9d32378fc8a13abd6b2dc8ff0a1b955ddcf
blob + 999728f012721a0813a2c1d886f685751bd37fd7
--- got.1.html
+++ got.1.html
<html>
<!-- This is an automatically generated file. Do not edit.
Copyright (c) 2017 Martin Pieuchot
- Copyright (c) 2018, 2019 Stefan Sperling
+ Copyright (c) 2018, 2019, 2020 Stefan Sperling
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
<dl class="Bl-tag">
<dt><a class="permalink" href="#h"><code class="Fl" id="h">-h</code></a></dt>
<dd>Display usage information and exit immediately.</dd>
- <dt><a class="permalink" href="#V"><code class="Fl" id="V">-V</code></a></dt>
+ <dt><a class="permalink" href="#V,"><code class="Fl" id="V,">-V,</code></a>
+ <code class="Fl">--version</code></dt>
<dd>Display program version and exit immediately.</dd>
</dl>
<p class="Pp">The commands for <code class="Nm">got</code> are as follows:</p>
<dt><a class="permalink" href="#im"><code class="Cm" id="im">im</code></a></dt>
<dd>Short alias for <code class="Cm">import</code>.</dd>
<dt><a class="permalink" href="#checkout"><code class="Cm" id="checkout">checkout</code></a>
- [<code class="Fl">-b</code> <var class="Ar">branch</var>]
- [<code class="Fl">-c</code> <var class="Ar">commit</var>]
- [<code class="Fl">-p</code> <var class="Ar">path-prefix</var>]
- <var class="Ar">repository-path</var>
+ [<code class="Fl">-E</code>] [<code class="Fl">-b</code>
+ <var class="Ar">branch</var>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-p</code>
+ <var class="Ar">path-prefix</var>] <var class="Ar">repository-path</var>
[<var class="Ar">work-tree-path</var>]</dt>
- <dd>Copy files from a repository into a new work tree. If the
- <var class="Ar">work tree path</var> is not specified, either use the last
- component of <var class="Ar">repository path</var>, or if a
- <var class="Ar">path prefix</var> was specified use the last component of
- <var class="Ar">path prefix</var>.
+ <dd>Copy files from a repository into a new work tree. Show the status of each
+ affected file, using the following status codes:
+ <table class="Bl-column">
+ <tr>
+ <td>A</td>
+ <td>new file was added</td>
+ </tr>
+ <tr>
+ <td>E</td>
+ <td>file already exists in work tree's meta-data</td>
+ </tr>
+ </table>
+ <p class="Pp">If the <var class="Ar">work tree path</var> is not specified,
+ either use the last component of <var class="Ar">repository path</var>,
+ or if a <var class="Ar">path prefix</var> was specified use the last
+ component of <var class="Ar">path prefix</var>.</p>
<p class="Pp">The options for <code class="Cm">got checkout</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt><a class="permalink" href="#E"><code class="Fl" id="E">-E</code></a></dt>
+ <dd>Proceed with the checkout operation even if the directory at
+ <var class="Ar">work-tree-path</var> is not empty. Existing files will
+ be left intact.</dd>
<dt><a class="permalink" href="#b_2"><code class="Fl" id="b_2">-b</code></a>
<var class="Ar">branch</var></dt>
<dd>Check out files from a commit on the specified
<dt><a class="permalink" href="#st"><code class="Cm" id="st">st</code></a></dt>
<dd>Short alias for <code class="Cm">status</code>.</dd>
<dt><a class="permalink" href="#log"><code class="Cm" id="log">log</code></a>
- [<code class="Fl">-c</code> <var class="Ar">commit</var>]
- [<code class="Fl">-C</code> <var class="Ar">number</var>]
- [<code class="Fl">-f</code>] [<code class="Fl">-l</code>
+ [<code class="Fl">-b</code>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-C</code>
+ <var class="Ar">number</var>] [<code class="Fl">-l</code>
<var class="Ar">N</var>] [<code class="Fl">-p</code>]
+ [<code class="Fl">-s</code> <var class="Ar">search-pattern</var>]
[<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
[<var class="Ar">path</var>]</dt>
<dd>Display history of a repository. If a <var class="Ar">path</var> is
<p class="Pp">The options for <code class="Cm">got log</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt><a class="permalink" href="#b_4"><code class="Fl" id="b_4">-b</code></a></dt>
+ <dd>Display individual commits which were merged into the current branch
+ from other branches. By default, <code class="Cm">got log</code> shows
+ the linear history of the current branch only.</dd>
<dt><a class="permalink" href="#c_3"><code class="Fl" id="c_3">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Start traversing history at the specified
<dd>Set the number of context lines shown in diffs with
<code class="Fl">-p</code>. By default, 3 lines of context are
shown.</dd>
- <dt><a class="permalink" href="#f"><code class="Fl" id="f">-f</code></a></dt>
- <dd>Restrict history traversal to the first parent of each commit. This
- shows the linear history of the current branch only. Merge commits
- which affected the current branch will be shown but individual commits
- which originated on other branches will be omitted.</dd>
<dt><a class="permalink" href="#l"><code class="Fl" id="l">-l</code></a>
<var class="Ar">N</var></dt>
<dd>Limit history traversal to a given number of commits. If this option
<dd>Display the patch of modifications made in each commit. If a
<var class="Ar">path</var> is specified, only show the patch of
modifications at or within this path.</dd>
+ <dt><a class="permalink" href="#s"><code class="Fl" id="s">-s</code></a>
+ <var class="Ar">search-pattern</var></dt>
+ <dd>If specified, show only commits with a log message matched by the
+ extended regular expression <var class="Ar">search-pattern</var>.
+ Regular expression syntax is documented in
+ <a class="Xr">re_format(7)</a>.</dd>
<dt><a class="permalink" href="#r_2"><code class="Fl" id="r_2">-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 <code class="Nm">got</code> work tree, use the
repository path associated with this work tree.</dd>
- <dt><a class="permalink" href="#s"><code class="Fl" id="s">-s</code></a></dt>
+ <dt><a class="permalink" href="#s_2"><code class="Fl" id="s_2">-s</code></a></dt>
<dd>Show changes staged with <code class="Cm">got stage</code> instead of
showing local changes. This option is only valid when
<code class="Cm">got diff</code> is invoked in a work tree.</dd>
<dt><a class="permalink" href="#d"><code class="Fl" id="d">-d</code></a>
<var class="Ar">name</var></dt>
<dd>Delete the reference with the specified name from the repository.</dd>
- <dt><a class="permalink" href="#s_2"><code class="Fl" id="s_2">-s</code></a></dt>
+ <dt><a class="permalink" href="#s_3"><code class="Fl" id="s_3">-s</code></a></dt>
<dd>Create a symbolic reference pointing at the specified
<var class="Ar">target</var>, which must be an existing reference.
Care should be taken not to create loops between references when this
copied to another repository.</p>
</dd>
<dt><a class="permalink" href="#add"><code class="Cm" id="add">add</code></a>
- [<code class="Fl">-R</code>] <var class="Ar">path ...</var></dt>
+ [<code class="Fl">-R</code>] [<code class="Fl">-I</code>]
+ <var class="Ar">path ...</var></dt>
<dd>Schedule unversioned files in a work tree for addition to the repository
in the next commit.
<p class="Pp">The options for <code class="Cm">got add</code> are as
<dd>Permit recursion into directories. If this option is not specified,
<code class="Cm">got add</code> will refuse to run if a specified
<var class="Ar">path</var> is a directory.</dd>
+ <dt><a class="permalink" href="#I_2"><code class="Fl" id="I_2">-I</code></a></dt>
+ <dd>With -R, add files even if they match a <code class="Cm">got
+ status</code> ignore pattern.</dd>
</dl>
</dd>
<dt><a class="permalink" href="#remove"><code class="Cm" id="remove">remove</code></a>
- <var class="Ar">file-path ...</var></dt>
+ [<code class="Fl">-f</code>] [<code class="Fl">-k</code>]
+ [<code class="Fl">-R</code>] <var class="Ar">path ...</var></dt>
<dd>Remove versioned files from a work tree and schedule them for deletion
from the repository in the next commit.
<p class="Pp">The options for <code class="Cm">got remove</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt><a class="permalink" href="#f_2"><code class="Fl" id="f_2">-f</code></a></dt>
+ <dt><a class="permalink" href="#f"><code class="Fl" id="f">-f</code></a></dt>
<dd>Perform the operation even if a file contains uncommitted
modifications.</dd>
+ <dt><a class="permalink" href="#k"><code class="Fl" id="k">-k</code></a></dt>
+ <dd>Keep affected files on disk.</dd>
+ <dt><a class="permalink" href="#R_3"><code class="Fl" id="R_3">-R</code></a></dt>
+ <dd>Permit recursion into directories. If this option is not specified,
+ <code class="Cm">got remove</code> will refuse to run if a specified
+ <var class="Ar">path</var> is a directory.</dd>
</dl>
</dd>
<dt><a class="permalink" href="#rm"><code class="Cm" id="rm">rm</code></a></dt>
“n”, and “q” responses line-by-line from
the specified <var class="Ar">response-script</var> file instead of
prompting interactively.</dd>
- <dt><a class="permalink" href="#R_3"><code class="Fl" id="R_3">-R</code></a></dt>
+ <dt><a class="permalink" href="#R_4"><code class="Fl" id="R_4">-R</code></a></dt>
<dd>Permit recursion into directories. If this option is not specified,
<code class="Cm">got revert</code> will refuse to run if a specified
<var class="Ar">path</var> is a directory.</dd>
merged change into a no-op change, the corresponding commit will be
elided when the rebase operation continues.</p>
<p class="Pp"><code class="Cm">got rebase</code> will refuse to run if
- certain preconditions are not met. If the work tree contains multiple
- base commits it must first be updated to a single base commit with
- <code class="Cm">got update</code>. If changes have been staged with
- <code class="Cm">got stage</code>, these changes must first be committed
- with <code class="Cm">got commit</code> or unstaged with
+ certain preconditions are not met. If the work tree is not yet fully
+ updated to the tip commit of its branch then the work tree must first be
+ updated with <code class="Cm">got update</code>. If changes have been
+ staged with <code class="Cm">got stage</code>, these changes must first
+ be committed with <code class="Cm">got commit</code> or unstaged with
<code class="Cm">got unstage</code>. If the work tree contains local
changes, these changes must first be committed with <code class="Cm">got
commit</code> or reverted with <code class="Cm">got revert</code>. If
committed in the 3 most recent commits to the work tree's branch, or the
branch resolved via the repository's HEAD reference, respectively:</p>
<p class="Pp"></p>
-<div class="Bd Bd-indent"><code class="Li">$ got log -p -l 3 -f</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got log -p -l 3</code></div>
<p class="Pp">Add new files and remove obsolete files in a work tree
directory:</p>
<p class="Pp"></p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ cd /var/git/repo</code></div>
<div class="Bd Bd-indent"><code class="Li">$ git fetch</code></div>
-<p class="Pp">Before outgoing changes on the local “master” branch
- can be pushed to the remote repository, the local “master”
- branch must be rebased onto the “origin/master” branch:</p>
+<p class="Pp">To make changes fetched from the remote repository appear on the
+ “master” branch, the “master” branch must be
+ rebased onto the “origin/master” branch. This will also merge
+ local changes, if any, with the incoming changes:</p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ got update -b
origin/master</code></div>
<div class="Bd Bd-indent"><code class="Li">$ got rebase master</code></div>
-<p class="Pp">Changes on the local “master” branch can then be
+<p class="Pp">Local changes on the “master” branch can then be
pushed to the remote repository with <code class="Cm">git push</code>:</p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ cd /var/git/repo</code></div>
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 27, 2019</td>
+ <td class="foot-date">February 18, 2020</td>
<td class="foot-os">OpenBSD 6.6</td>
</tr>
</table>
blob - 2b64569a6b196ae9f12d0121a6201fcc53938a50
blob + c1c37d1c8fafa7fdc565f863195a38e59e369e9b
--- tog.1.html
+++ tog.1.html
<dl class="Bl-tag">
<dt><a class="permalink" href="#h"><code class="Fl" id="h">-h</code></a></dt>
<dd>Display usage information.</dd>
- <dt><a class="permalink" href="#V"><code class="Fl" id="V">-V</code></a></dt>
+ <dt><a class="permalink" href="#V,"><code class="Fl" id="V,">-V,</code></a>
+ <code class="Fl">--version</code></dt>
<dd>Display program version and exit immediately.</dd>
</dl>
<p class="Pp">The commands for <code class="Nm">tog</code> are as follows:</p>
<dl class="Bl-tag">
<dt><a class="permalink" href="#log"><code class="Cm" id="log">log</code></a>
- [<code class="Fl">-c</code> <var class="Ar">commit</var>]
- [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
- [<var class="Ar">path</var>]</dt>
+ [<code class="Fl">-b</code>] [<code class="Fl">-c</code>
+ <var class="Ar">commit</var>] [<code class="Fl">-r</code>
+ <var class="Ar">repository-path</var>] [<var class="Ar">path</var>]</dt>
<dd>Display history of a repository. If a <var class="Ar">path</var> is
specified, show only commits which modified this path.
<p class="Pp">This command is also executed if no explicit command is
<code class="Cm">Backspace</code> key is pressed.</dd>
<dt><a class="permalink" href="#Ctrl+l"><code class="Cm" id="Ctrl+l">Ctrl+l</code></a></dt>
<dd>Reload the log view with new commits found in the repository.</dd>
+ <dt><a class="permalink" href="#B"><code class="Cm" id="B">B</code></a></dt>
+ <dd>Reload the log view and toggle display of merged commits. The
+ <code class="Fl">-b</code> option determines whether merged commits
+ are displayed initially.</dd>
</dl>
<p class="Pp">The options for <code class="Cm">tog log</code> are as
follows:</p>
<dl class="Bl-tag">
+ <dt><a class="permalink" href="#b"><code class="Fl" id="b">-b</code></a></dt>
+ <dd>Display individual commits which were merged into the current branch
+ from other branches. By default, <code class="Cm">tog log</code> shows
+ the linear history of the current branch only. The
+ <code class="Cm">B</code> key binding can be used to toggle display of
+ merged commits at run-time.</dd>
<dt><a class="permalink" href="#c"><code class="Fl" id="c">-c</code></a>
<var class="Ar">commit</var></dt>
<dd>Start traversing history at the specified
Full stop</code></a></dt>
<dd>If the diff view was opened via the log view, move to the next (older)
commit.</dd>
+ <dt><a class="permalink" href="#/_2"><code class="Cm" id="/_2">/</code></a></dt>
+ <dd>Prompt for a search pattern and start searching for matching line. The
+ search pattern is an extended regular expression. Regular expression
+ syntax is documented in <a class="Xr">re_format(7)</a>.</dd>
+ <dt><a class="permalink" href="#n_2"><code class="Cm" id="n_2">n</code></a></dt>
+ <dd>Find the next line which matches the current search pattern.</dd>
+ <dt><a class="permalink" href="#N_2"><code class="Cm" id="N_2">N</code></a></dt>
+ <dd>Find the previous line which matches the current search pattern.</dd>
</dl>
</dd>
<dt><a class="permalink" href="#blame"><code class="Cm" id="blame">blame</code></a>
<dt><a class="permalink" href="#Enter"><code class="Cm" id="Enter">Enter</code></a></dt>
<dd>Open a <code class="Cm">diff</code> view for the currently selected
line's commit.</dd>
- <dt><a class="permalink" href="#b"><code class="Cm" id="b">b</code></a></dt>
+ <dt><a class="permalink" href="#b_2"><code class="Cm" id="b_2">b</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><a class="permalink" href="#p"><code class="Cm" id="p">p</code></a></dt>
<dd>Reload the <code class="Cm">blame</code> view with the version of the
file as found in the parent commit of the currently selected line's
commit.</dd>
- <dt><a class="permalink" href="#B"><code class="Cm" id="B">B</code></a></dt>
+ <dt><a class="permalink" href="#B_2"><code class="Cm" id="B_2">B</code></a></dt>
<dd>Reload the <code class="Cm">blame</code> view with the previously
blamed commit.</dd>
- <dt><a class="permalink" href="#/_2"><code class="Cm" id="/_2">/</code></a></dt>
+ <dt><a class="permalink" href="#/_3"><code class="Cm" id="/_3">/</code></a></dt>
<dd>Prompt for a search pattern and start searching for matching line. The
search pattern is an extended regular expression. Regular expression
syntax is documented in <a class="Xr">re_format(7)</a>.</dd>
- <dt><a class="permalink" href="#n_2"><code class="Cm" id="n_2">n</code></a></dt>
+ <dt><a class="permalink" href="#n_3"><code class="Cm" id="n_3">n</code></a></dt>
<dd>Find the next line which matches the current search pattern.</dd>
- <dt><a class="permalink" href="#N_2"><code class="Cm" id="N_2">N</code></a></dt>
+ <dt><a class="permalink" href="#N_3"><code class="Cm" id="N_3">N</code></a></dt>
<dd>Find the previous line which matches the current search pattern.</dd>
</dl>
<p class="Pp">The options for <code class="Cm">tog blame</code> are as
</dd>
<dt><a class="permalink" href="#tree"><code class="Cm" id="tree">tree</code></a>
[<code class="Fl">-c</code> <var class="Ar">commit</var>]
- [<var class="Ar">repository-path</var>]</dt>
- <dd>Display the repository tree. If the <var class="Ar">repository path</var>
- is omitted, assume the repository is located in the current working
- directory.
+ [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]</dt>
+ <dd>Display the repository tree.
<p class="Pp">Displayed tree entries may carry one of the following trailing
annotations:</p>
<table class="Bl-column">
<dt><a class="permalink" href="#i"><code class="Cm" id="i">i</code></a></dt>
<dd>Show object IDs for all objects displayed in the
<code class="Cm">tree</code> view.</dd>
- <dt><a class="permalink" href="#/_3"><code class="Cm" id="/_3">/</code></a></dt>
+ <dt><a class="permalink" href="#/_4"><code class="Cm" id="/_4">/</code></a></dt>
<dd>Prompt for a search pattern and start searching for matching tree
entries. The search pattern is an extended regular expression which is
matched against the tree entry's name. Regular expression syntax is
documented in <a class="Xr">re_format(7)</a>.</dd>
- <dt><a class="permalink" href="#n_3"><code class="Cm" id="n_3">n</code></a></dt>
+ <dt><a class="permalink" href="#n_4"><code class="Cm" id="n_4">n</code></a></dt>
<dd>Find the next tree entry which matches the current search
pattern.</dd>
- <dt><a class="permalink" href="#N_3"><code class="Cm" id="N_3">N</code></a></dt>
+ <dt><a class="permalink" href="#N_4"><code class="Cm" id="N_4">N</code></a></dt>
<dd>Find the previous tree entry which matches the current search
pattern.</dd>
</dl>
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>
+ <dt><a class="permalink" href="#r_3"><code class="Fl" id="r_3">-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">got(1)</a> work tree, use the
+ repository path associated with this work tree.</dd>
</dl>
</dd>
</dl>
value “magenta” is used.</dd>
<dt><a class="permalink" href="#TOG_COLOR_TREE_SYMLINK"><code class="Ev" id="TOG_COLOR_TREE_SYMLINK">TOG_COLOR_TREE_SYMLINK</code></a></dt>
<dd>The color used to mark up symbolic link tree entries. If not set, the
- default value “cyan” is used.</dd>
+ default value “magenta” is used.</dd>
<dt><a class="permalink" href="#TOG_COLOR_TREE_DIRECTORY"><code class="Ev" id="TOG_COLOR_TREE_DIRECTORY">TOG_COLOR_TREE_DIRECTORY</code></a></dt>
<dd>The color used to mark up directory tree entries. If not set, the default
- value “blue” is used.</dd>
+ value “cyan” is used.</dd>
<dt><a class="permalink" href="#TOG_COLOR_TREE_EXECUTABLE"><code class="Ev" id="TOG_COLOR_TREE_EXECUTABLE">TOG_COLOR_TREE_EXECUTABLE</code></a></dt>
<dd>The color used to mark up executable file tree entries. If not set, the
default value “green” is used.</dd>
</div>
<table class="foot">
<tr>
- <td class="foot-date">November 27, 2019</td>
+ <td class="foot-date">February 18, 2020</td>
<td class="foot-os">OpenBSD 6.6</td>
</tr>
</table>
