commit - 9e67ab87b19a7e0aac9ed41bc90ab61578403f28
commit + a462773eaf5ca2e0e9947d50200341f491c9c32e
blob - 3dc3b7033b11831036e185f78862d7e9c05a01a1
blob + f7ac2fadb65e9b037bd344285a4a0b35ffaf103a
--- git-repository.5.html
+++ git-repository.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">April 14, 2020</td>
+ <td class="foot-date">April 19, 2020</td>
<td class="foot-os">OpenBSD 6.6</td>
</tr>
</table>
blob - a96f97bad2fc8a37465b7629293f123659c5a4c9
blob + 6a332b1cdd3baba23e69da56c0ac22cc7bbc7da3
--- got-worktree.5.html
+++ got-worktree.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">April 14, 2020</td>
+ <td class="foot-date">April 19, 2020</td>
<td class="foot-os">OpenBSD 6.6</td>
</tr>
</table>
blob - efb9dea47719450d19ecdde457ebb9fe647eeccd
blob + 88d2eb8d31d2efd25d1fcd643418af54eb64b861
--- got.1.html
+++ got.1.html
<dt><a class="permalink" href="#m_2"><code class="Fl" id="m_2">-m</code></a></dt>
<dd>Create the cloned repository as a mirror of the original repository.
This is useful if the cloned repository will not be used to store
- local changes as created by <code class="Cm">got commit</code>.
+ locally created commits.
<p class="Pp">The repository's <span class="Pa">config</span> file will
be set up with the “mirror” option enabled, such that
<code class="Cm">got fetch</code> or <a class="Xr">git-fetch(1)</a>
- will write incoming changes directly to local branches in the
+ will write incoming changes directly to branches in the
“refs/heads/” reference namespace, rather than to
branches in the “refs/remotes/” namespace. This avoids
the usual requirement of having to run <code class="Cm">got
rebase</code> after <code class="Cm">got fetch</code> in order to
- make incoming changes appear on local branches. But maintaining
- local changes in the cloned repository becomes difficult since local
+ make incoming changes appear on branches in the
+ “refs/heads/” namespace. But maintaining custom
+ changes in the cloned repository becomes difficult since such
changes will be at risk of being discarded whenever incoming changes
are fetched.</p>
</dd>
“refs/remotes/” reference namespace will be updated to
point at the newly fetched commits. The <code class="Cm">got
rebase</code> command can then be used to make new changes visible on
- local branches in the “refs/heads/” namespace, merging
- incoming changes with local changes as necessary.</p>
+ branches in the “refs/heads/” namespace, merging incoming
+ changes with the changes on those branches as necessary.</p>
<p class="Pp">If the repository was created as a mirror with
<code class="Cm">got clone -m</code> then all branches in the
“refs/heads/” namespace will be updated directly to match
the corresponding branches in the remote repository. If those branches
contained local commits, these commits will no longer be reachable via a
reference and will therefore be at risk of being discarded by Git's
- garbage collector. Maintaining local changes in a mirror repository is
+ garbage collector. Maintaining custom changes in a mirror repository is
therefore discouraged.</p>
<p class="Pp">In any case, references in the “refs/tags/”
namespace will always be fetched and mapped directly to local references
was created as a mirror with <code class="Cm">got clone -m</code> in
which case references will be mapped directly into the local
repository's “refs/” namespace.</p>
- <p class="Pp">Once a reference has been fetched, a local branch based on
- it can be created with <code class="Cm">got branch</code> if
+ <p class="Pp">Once a reference has been fetched, a branch based on it
+ can be created with <code class="Cm">got branch</code> if
needed.</p>
<p class="Pp"><code class="Cm">got fetch</code> will refuse to fetch
references from the remote repository's
Change existing files in the work tree as necessary to match file contents
of this commit. Preserve any local changes in the work tree and merge them
with the incoming changes.
+ <p class="Pp">Files which already contain merge conflicts will not be
+ updated to avoid further complications. Such files will be updated when
+ <code class="Cm">got update</code> is run again after merge conflicts
+ have been resolved. If the conflicting changes are no longer needed
+ affected files can be reverted with <code class="Cm">got revert</code>
+ before running <code class="Cm">got update</code> again.</p>
<p class="Pp">Show the status of each affected file, using the following
status codes:</p>
<table class="Bl-column">
<tr>
<td>!</td>
<td>a missing versioned file was restored</td>
+ </tr>
+ <tr>
+ <td>#</td>
+ <td>file was not updated because it contains merge conflicts</td>
</tr>
</table>
<p class="Pp">If no <var class="Ar">path</var> is specified, update the
<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>
+ [<code class="Fl">-R</code>] [<code class="Fl">-x</code>
+ <var class="Ar">commit</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. If invoked in a
work tree, the <var class="Ar">path</var> is interpreted relative to 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="#R_3"><code class="Fl" id="R_3">-R</code></a></dt>
+ <dd>Determine a set of commits to display as usual, but display these
+ commits in reverse order.</dd>
+ <dt><a class="permalink" href="#x"><code class="Fl" id="x">-x</code></a>
+ <var class="Ar">commit</var></dt>
+ <dd>Stop traversing commit history as soon as the specified
+ <var class="Ar">commit</var> has been traversed. This option has no
+ effect if the specified <var class="Ar">commit</var> is never
+ traversed.</dd>
</dl>
</dd>
<dt><a class="permalink" href="#diff"><code class="Cm" id="diff">diff</code></a>
[<var class="Ar">object1</var> <var class="Ar">object2</var> |
<var class="Ar">path</var>]</dt>
<dd>When invoked within a work tree with less than two arguments, display
- uncommitted changes in the work tree. If a <var class="Ar">path</var> is
+ local changes in the work tree. If a <var class="Ar">path</var> is
specified, only show changes within this path.
<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
repository path associated with this work tree.</dd>
<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
+ showing local changes in the work tree. This option is only valid when
<code class="Cm">got diff</code> is invoked in a work tree.</dd>
<dt><a class="permalink" href="#w"><code class="Fl" id="w">-w</code></a></dt>
<dd>Ignore whitespace-only changes.</dd>
<dt><a class="permalink" href="#i"><code class="Fl" id="i">-i</code></a></dt>
<dd>Show object IDs of files (blob objects) and directories (tree
objects).</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>Recurse into sub-directories in the repository.</dd>
</dl>
</dd>
<p class="Pp">The options for <code class="Cm">got add</code> are as
follows:</p>
<dl class="Bl-tag">
- <dt><a class="permalink" href="#R_4"><code class="Fl" id="R_4">-R</code></a></dt>
+ <dt><a class="permalink" href="#R_5"><code class="Fl" id="R_5">-R</code></a></dt>
<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>
follows:</p>
<dl class="Bl-tag">
<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>
+ <dd>Perform the operation even if a file contains local
+ 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_5"><code class="Fl" id="R_5">-R</code></a></dt>
+ <dt><a class="permalink" href="#R_6"><code class="Fl" id="R_6">-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>
[<code class="Fl">-p</code>] [<code class="Fl">-F</code>
<var class="Ar">response-script</var>] [<code class="Fl">-R</code>]
<var class="Ar">path ...</var></dt>
- <dd>Revert any uncommitted changes in files at the specified paths. File
- contents will be overwritten with those contained in the work tree's base
- commit. There is no way to bring discarded changes back after
+ <dd>Revert any local changes in files at the specified paths in a work tree.
+ File contents will be overwritten with those contained in the work tree's
+ base commit. There is no way to bring discarded changes back after
<code class="Cm">got revert</code>!
<p class="Pp">If a file was added with <code class="Cm">got add</code> it
will become an unversioned file again. If a file was deleted with
“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_6"><code class="Fl" id="R_6">-R</code></a></dt>
+ <dt><a class="permalink" href="#R_7"><code class="Fl" id="R_7">-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>
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</code></div>
+<p class="Pp">As above, but display changes in the order in which
+ <a class="Xr">patch(1)</a> could apply them in sequence:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got log -p -l 3 -R</code></div>
<p class="Pp">In a work tree or a git repository directory, log the history of a
subdirectory:</p>
<p class="Pp"></p>
</div>
<table class="foot">
<tr>
- <td class="foot-date">April 14, 2020</td>
+ <td class="foot-date">April 19, 2020</td>
<td class="foot-os">OpenBSD 6.6</td>
</tr>
</table>
blob - 0cd45f8ebb1a60631130b5676e1510781133240b
blob + 1af156ecfa9c141a56a15b10ac20d01f9c1ddafe
--- gotweb.8.html
+++ gotweb.8.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">April 14, 2020</td>
+ <td class="foot-date">April 19, 2020</td>
<td class="foot-os">OpenBSD 6.6</td>
</tr>
</table>
blob - 3778de070380bde2f95eaf0b47a05480863c6e05
blob + d5f1abf91592e5ed635515e16397fa96889e9d81
--- tog.1.html
+++ tog.1.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">April 14, 2020</td>
+ <td class="foot-date">April 19, 2020</td>
<td class="foot-os">OpenBSD 6.6</td>
</tr>
</table>
