shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-10 05:18:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2157 from agners/improve-man-pages

Browse Source 
Improve man pages
This commit is contained in:
OpenShift Merge Robot 2020-07-31 14:12:42 -04:00 committed by GitHub
commit a5409b872f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 97 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
man/ostree-commit.xml
View File

@ -82,6 +82,14 @@ Boston, MA 02111-1307, USA.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--body-file</option>, <option>-F</option>="FILE"</term>
<listitem><para>
Full commit description from a file. (optional)
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--editor</option>, <option>-e</option></term>
@ -98,6 +106,14 @@ Boston, MA 02111-1307, USA.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--parent</option>="COMMIT"</term>
<listitem><para>
Parent checksum or "none" to explicitly use no parent. If not specified, <literal>BRANCH</literal> is used as parent (no parent in case <literal>BRANCH</literal> does not exist).
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--tree</option>="dir=PATH" or "tar=TARFILE" or "ref=COMMIT"</term>
@ -119,7 +135,23 @@ Boston, MA 02111-1307, USA.
<term><option>--add-metadata-string</option>="KEY=VALUE"</term>
<listitem><para>
Add a key/value pair to metadata.
Add a key/value pair to metadata. Can be specified multiple times.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--add-metadata</option>="KEY=VALUE"</term>
<listitem><para>
Add a key/value pair to metadata, where the KEY is a string, and VALUE is g_variant_parse() formatted. Can be specified multiple times.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--keep-metadata</option>="KEY"</term>
<listitem><para>
Keep metadata KEY and its associated VALUE from parent. Can be specified multiple times.
</para></listitem>
</varlistentry>

64
man/ostree.xml
View File

@ -483,6 +483,70 @@ Boston, MA 02111-1307, USA.
</para>
</refsect1>
<refsect1>
<title>Terminology</title>
<para>
The following terms are commonly used throughout the man pages. Terms in upper case letters
are literals used in command line arguments.
</para>
<glosslist>
<glossentry><glossterm><literal>BRANCH</literal></glossterm>
<glossdef>
<para>
Branch name. Part of a <glossterm><literal>REF</literal></glossterm>.
</para>
</glossdef>
</glossentry>
<glossentry><glossterm><literal>CHECKSUM</literal></glossterm>
<glossdef>
<para>
A SHA256 hash of a object stored in the OSTree repository. This can be a content,
a dirtree, a dirmeta or a commit object. If the SHA256 hash of a commit object is
meant, the term <glossterm><literal>COMMIT</literal></glossterm> is used.
</para>
</glossdef>
</glossentry>
<glossentry><glossterm><literal>COMMIT</literal></glossterm>
<glossdef>
<para>
A SHA256 hash of a commit object.
</para>
</glossdef>
</glossentry>
<glossentry><glossterm><literal>REF</literal></glossterm>
<glossdef>
<para>
A reference to a particular commit. References are text files stored in
<filename>refs/</filename> that name (refer to) a particular commit. A
reference can only be the branch name part, in which case a local reference
is used (e.g. <literal>mybranch/stable</literal>). If a remote branch
is referred to, the remote name followed by a colon and the branch name
needs to be used (e.g. <literal>myremote:mybranch/stable</literal>).
</para>
</glossdef>
</glossentry>
<glossentry><glossterm><literal>REV</literal></glossterm> <glossterm><literal>REFSPEC</literal></glossterm>
<glossdef>
<para>
A specific revision, a commit. This can be anything which can be resolved to a
commit, e.g. a <glossterm><literal>REF</literal></glossterm> or a
<glossterm><literal>COMMIT</literal></glossterm>.
</para>
</glossdef>
</glossentry>
<glossentry><glossterm>SHA256</glossterm>
<glossdef>
<para>
A cryptographic hash function used to store objects in the OSTree
repository. The hashes have a length of 256 bites and are typically
shown and passed to ostree in its 64 ASCII character long hexadecimal
representation
(e.g. 0fc70ed33cfd7d26fe99ae29afb7682ddd0e2157a4898bd8cfcdc8a03565b870).
</para>
</glossdef>
</glossentry>
</glosslist>
</refsect1>
<refsect1>
<title>See Also</title>
<para>