commit 376d4d523d69b4f587a937263f1d74b533d71864 from: Stefan Sperling date: Mon Jul 04 13:33:39 2022 UTC sync man pages commit - 61208e9aa588d74ac2384d05a36079d8694ddb06 commit + 376d4d523d69b4f587a937263f1d74b533d71864 blob - cdc98c72a449012a42aa596d11e8e99bf2ab1726 blob + 2b0eece7bd0858ce72e9d8d0330806e97fa1daf8 --- git-repository.5.html +++ git-repository.5.html @@ -86,7 +86,8 @@ header is terminated by a character, and the remainder of the file contains object data. Loose objects files are - compressed with deflate(3).

+ compressed with deflate(3).

Multiple objects can be bundled in a pack file for better disk space efficiency and increased run-time performance. The pack file format introduces two additional types of objects:

@@ -151,18 +152,22 @@
branches/
Legacy directory used by the deprecated Gogito Git interface.
config
-
Git configuration file. See git-config(1).
+
Git configuration file. See git-config(1).
description
A human-readable description of the repository.
got.conf
-
Configuration file for got(1). See - got.conf(5).
+
Configuration file for got(1). See got.conf(5).
hooks/
This directory contains hook scripts to run when certain events occur.
index
-
The file index used by git(1). This file is not used by - got(1), which uses the got-worktree(5) +
The file index used by git(1). This file is not used by got(1), which uses the + got-worktree(5) file index instead.
info
Various configuration items.
@@ -181,15 +186,19 @@ tree is present, the actual repository data is stored in a .git subfolder of the repository's root directory. A Git repository without a work tree is known as a “bare” - repository. got(1) does not make use of Git's work tree - and treats every repository as if it was bare.

+ repository. got(1) does not + make use of Git's work tree and treats every repository as if it was + bare.

-

got(1), gotadmin(1), - deflate(3), SHA1(3), - got-worktree(5), got.conf(5)

+

got(1), + gotadmin(1), + deflate(3), + SHA1(3), + got-worktree(5), + got.conf(5)

@@ -201,15 +210,15 @@

The particular set of disallowed characters in reference names is a consequence of design choices made for the command-line interface of - git(1). The same characters are disallowed by Got for - compatibility purposes. Got additionally prevents users from creating - reference names with a leading - (dash) character, because this is rarely - intended and not considered useful.

+ git(1). The same characters + are disallowed by Got for compatibility purposes. Got additionally prevents + users from creating reference names with a leading - (dash) character, + because this is rarely intended and not considered useful.

- +
June 18, 2022July 4, 2022 OpenBSD 7.1
blob - 42331d97a207bd57dc04eab0093c69fd709fb75e blob + 492fbb5771927f65c53de429ab203f7865a796a3 --- got-worktree.5.html +++ got-worktree.5.html @@ -43,7 +43,8 @@ a Git repository. The work tree's meta data is stored in the .got directory. A work tree is created with got checkout and is required to make changes to a - Git repository with got(1).

+ Git repository with got(1).

A work tree stores the path to its Git repository, the name of a reference to the branch which files were checked out from, and the ID of a commit on this branch known as the @@ -57,11 +58,11 @@

Copy of filesystem meta-data
Timestamp, file size, and file ownership information from - stat(2). This is only used to detect file modifications - and is never applied back to the filesystem. File permissions are not - tracked, except for the executable bit. When versioned files are checked - out into the work tree, the current umask(2) is - heeded.
+ stat(2). This is only used + to detect file modifications and is never applied back to the filesystem. + File permissions are not tracked, except for the executable bit. When + versioned files are checked out into the work tree, the current + umask(2) is heeded.
Blob object ID
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.
@@ -72,8 +73,9 @@ may still need to be updated to match file content stored in the base commit.
Flags
-
This field contains the length, according to strlen(3), - of path data which follows, and the following flags: +
This field contains the length, according to + strlen(3), of path data + which follows, and the following flags:
STAGE
Reflects the added, modified, or deleted staged state of a path staged @@ -132,11 +134,12 @@

When the file index is modified, it is read into memory in its entirety, modified in place, and written to a temporary file. This temporary file is then moved on top of the old file index with - rename(2). This ensures that no other processes see an - inconsistent file index which is in the process of being written.

+ rename(2). This ensures + that no other processes see an inconsistent file index which is in the + process of being written.

Work tree meta data must only be modified while the work tree's lock file has been exclusively locked with - lockf(3).

+ lockf(3).

Each work tree has a universal unique identifier. When a work tree is checked out or updated, this identifier is used to create a reference to the current base commit in the Git repository. The presence of this @@ -157,8 +160,9 @@

format
Work tree format number.
got.conf
-
Configuration file for got(1). See - got.conf(5).
+
Configuration file for got(1). See got.conf(5).
head-ref
Name of the reference to the current branch.
lock
@@ -174,15 +178,18 @@

-

got(1), rename(2), - stat(2), umask(2), - lockf(3), git-repository(5), - got.conf(5)

+

got(1), + rename(2), + stat(2), + umask(2), + lockf(3), + git-repository(5), + got.conf(5)

- +
June 18, 2022July 4, 2022 OpenBSD 7.1
blob - fb0dcd1926d0c9d20b134523f68b6cf6a2c7945a blob + 06436b9a7b4be95a3b33081c1b725b88ce6501fa --- got.1.html +++ got.1.html @@ -51,7 +51,8 @@

got is a version control system which stores the history of tracked files in a Git repository, as used by the Git version control system. This repository format is described in - git-repository(5).

+ git-repository(5).

got is a “distributed” version control system because every copy of a repository is writeable. Modifications made to files can be synchronized between repositories at any @@ -61,7 +62,7 @@ stored in a which can be placed at an arbitrary directory in the filesystem hierarchy. The on-disk format of this work tree is described in - got-worktree(5).

+ got-worktree(5).

got provides global and command-specific options. Global options must precede the command name, and are as follows:

@@ -99,12 +100,12 @@ the path of each imported file to indicate progress.

The got import command requires the GOT_AUTHOR environment variable to be set, - unless an author has been configured in got.conf(5) or - Git's user.name and - user.email configuration settings can be - obtained from the repository's .git/config file - or from Git's global ~/.gitconfig configuration - file.

+ unless an author has been configured in + got.conf(5) or Git's + user.name and user.email + configuration settings can be obtained from the repository's + .git/config file or from Git's global + ~/.gitconfig configuration file.

The options for got import are as follows:

@@ -129,7 +130,7 @@ pattern. This option may be specified multiple times to build a list of ignore patterns. The pattern follows the globbing rules documented in - glob(7).
+ glob(7).
@@ -155,13 +156,15 @@

The following protocol schemes are supported:

git
-
The Git protocol as implemented by the git-daemon(1) +
The Git protocol as implemented by the + git-daemon(1) server. Use of this protocol is discouraged since it supports neither authentication nor encryption.
git+ssh
The Git protocol wrapped in an authenticated and encrypted - ssh(1) tunnel. With this protocol the hostname may - contain an embedded username for ssh(1) to use: + ssh(1) tunnel. With this + protocol the hostname may contain an embedded username for + ssh(1) to use: user@hostname
ssh
Short alias for git+ssh.
@@ -172,26 +175,27 @@ pack file are stored in deltified form, all deltas will be fully resolved in order to compute the ID of such objects. This can take some time. More details about the pack file format are documented in - git-repository(5).

+ git-repository(5).

got clone creates a remote repository - entry in the got.conf(5) and - config files of the cloned repository to store - the repository-url and any - branch or reference + entry in the got.conf(5) and config files of the + cloned repository to store the repository-url and + any branch or reference arguments for future use by got fetch or - git-fetch(1).

+ git-fetch(1).

The options for got clone are as follows:

Fetch all branches from the remote repository's “refs/heads/” reference namespace and set - fetch-all-branches in the cloned repository's - got.conf(5) file for future use by - got fetch. If this option is not specified, a - branch resolved via the remote repository's HEAD reference will be - fetched. Cannot be used together with the -b - option.
+ fetch_all_branches in the cloned repository's + got.conf(5) file + for future use by got fetch. If this option is + not specified, a branch resolved via the remote repository's HEAD + reference will be fetched. Cannot be used together with the + -b option.
branch
Fetch the specified branch from the remote @@ -212,10 +216,11 @@
Create the cloned repository as a mirror of the original repository. This is useful if the cloned repository will not be used to store locally created commits. -

The repository's got.conf(5) and - config files will be set up with the - “mirror” option enabled, such that - got fetch or git-fetch(1) +

The repository's got.conf(5) and config files + will be set up with the “mirror” option enabled, such + that got fetch or + git-fetch(1) will write incoming changes directly to branches in the “refs/heads/” reference namespace, rather than to branches in the “refs/remotes/” namespace. This avoids @@ -229,12 +234,14 @@

Suppress progress reporting output. The same option will be passed to - ssh(1) if applicable.
+ ssh(1) if + applicable.
Verbose mode. Causes got clone to print debugging messages to standard error output. This option will be - passed to ssh(1) if applicable. Multiple -v options - increase the verbosity. The maximum is 3.
+ passed to ssh(1) if + applicable. Multiple -v options increase the verbosity. The maximum is + 3.
reference
In addition to the branches and tags that will be fetched, fetch an @@ -270,12 +277,14 @@ Fetch new changes from a remote repository. If no remote-repository is specified, “origin” will be used. The remote repository's URL is - obtained from the corresponding entry in got.conf(5) or - Git's config file of the local repository, as - created by got clone. + obtained from the corresponding entry in + got.conf(5) or Git's + config file of the local repository, as created by + got clone.

New changes will be stored in a separate pack file downloaded from the server. Optionally, separate pack files stored in the - repository can be combined with git-repack(1).

+ repository can be combined with git-repack(1).

By default, branch references in the “refs/remotes/” reference namespace will be updated to point at the newly fetched commits. The got @@ -301,10 +310,10 @@

Fetch all branches from the remote repository's “refs/heads/” reference namespace. This option can be enabled by default for specific repositories in - got.conf(5). If this option is not specified, a - branch resolved via the remote repository's HEAD reference will be - fetched. Cannot be used together with the -b - option.
+ got.conf(5). If + this option is not specified, a branch resolved via the remote + repository's HEAD reference will be fetched. Cannot be used together + with the -b option.
branch
Fetch the specified branch from the remote @@ -336,12 +345,14 @@ repository path associated with this work tree.
Suppress progress reporting output. The same option will be passed to - ssh(1) if applicable.
+ ssh(1) if + applicable.
Verbose mode. Causes got fetch to print debugging messages to standard error output. The same option will be - passed to ssh(1) if applicable. Multiple -v options - increase the verbosity. The maximum is 3.
+ passed to ssh(1) if + applicable. Multiple -v options increase the verbosity. The maximum is + 3.
reference
In addition to the branches and tags that will be fetched, fetch an @@ -368,7 +379,7 @@
Delete all references which correspond to a particular remote-repository instead of fetching new changes. This can be useful when a remote repository is being removed - from got.conf(5). + from got.conf(5).

With -X, the remote-repository argument is mandatory and no other options except -r, @@ -377,7 +388,8 @@

Only references are deleted. Any commit, tree, tag, and blob objects fetched from a remote repository will generally be stored in pack files and may be removed separately with - git-repack(1) and Git's garbage collector.

+ git-repack(1) + and Git's garbage collector.

@@ -653,21 +665,22 @@ Cannot be used together with the -s option.
-

For compatibility with cvs(1) and - git(1), got status reads - glob(7) patterns from - .cvsignore and - .gitignore files in each traversed directory and - will not display unversioned files which match these patterns. As an - extension to glob(7) matching rules, - got status supports consecutive asterisks, - “**”, which will match an arbitrary amount of directories. - Unlike cvs(1), got status only - supports a single ignore pattern per line. Unlike - git(1), got status does not - support negated ignore patterns prefixed with “!”, and - gives no special significance to the location of path component - separators, “/”, in a pattern.

+

For compatibility with cvs(1) and git(1), + got status reads glob(7) patterns from .cvsignore + and .gitignore files in each traversed directory + and will not display unversioned files which match these patterns. As an + extension to glob(7) + matching rules, got status supports consecutive + asterisks, “**”, which will match an arbitrary amount of + directories. Unlike cvs(1), got status only supports a single + ignore pattern per line. Unlike git(1), got status does not support + negated ignore patterns prefixed with “!”, and gives no + special significance to the location of path component separators, + “/”, in a pattern.

[-b] [-c @@ -755,7 +768,8 @@ patches will be matched if -p is specified. File paths changed by a commit will be matched if -P is specified. Regular expression syntax is - documented in re_format(7). + documented in re_format(7).
repository-path
Use the repository at the specified path. If not specified, assume the @@ -1109,7 +1123,9 @@ [-c commit] [-m message] [-r repository-path] - [-l] name + [-l] [-s + signer-id] [-v] + [-V] name
Manage tags in a repository.

Tags are managed via references which live in the “refs/tags/” reference namespace. The got @@ -1148,8 +1164,41 @@ repository path associated with this work tree.

List all existing tags in the repository instead of creating a new - tag. If this option is used, no other command-line arguments are - allowed.
+ tag. If a name argument is passed, show only the + tag with the given name. +
+ signer-id
+
While creating a new tag, sign this tag with the identity given in + signer-id. +

For SSH-based signatures, signer-id + is the path to a file which may refer to either a private SSH key, + or a public SSH key with the private half available via + ssh-agent(1). + got tag will sign the tag object by invoking + ssh-keygen(1) + with the -Y sign + command, using the signature namespace “git” for + compatibility with git(1).

+
+
+
Verbose mode. During SSH signature creation and verification this + option will be passed to ssh-keygen(1). Multiple -v options increase the verbosity. The + maximum is 3.
+
+
Verify tag object signatures. If a name is + specified, show and verify the tag object with the provided name. + Otherwise, list all tag objects and verify signatures where present. +

got tag verifies SSH-based + signatures by invoking ssh-keygen(1) with the options -Y + verify -f + allowed_signers. A path to the + allowed_signers file must be set in + got.conf(5), + otherwise verification is impossible.

+

By design, the got tag command will not delete tags or change existing tags. If a tag must be deleted, the @@ -1197,7 +1246,7 @@

Permit recursion into directories. If this option is not specified, got remove will refuse to run if a specified path is a directory.
-
+
status-codes
Only delete files with a modification status matching one of the single-character status codes contained in the @@ -1228,11 +1277,12 @@ Files added or removed by a patch will be scheduled for addition or removal in the work tree.

The patch must be in the unified diff format as produced by - got diff, git-diff(1), or by - diff(1) and cvs(1) diff when invoked - with their -u options. If no - patchfile argument is provided, read unified diff - data from standard input instead.

+ got diff, git-diff(1), or by diff(1) and cvs(1) diff when invoked with their -u + options. If no patchfile argument is provided, + read unified diff data from standard input instead.

If the patchfile contains multiple patches, then attempt to apply each of them in sequence.

Show the status of each affected file, using the following @@ -1243,6 +1293,14 @@ file was modified + G + file was merged using a merge-base found in the repository + + + C + file was merged and conflicts occurred during merge + + D file was deleted @@ -1284,8 +1342,8 @@ parsed from patchfile. If the -p option is not used, ‘a/’ and ‘b/’ path prefixes generated by - git-diff(1) will be recognized and stripped - automatically.

+ git-diff(1) will be + recognized and stripped automatically.
Reverse the patch before applying it.
@@ -1375,12 +1433,12 @@ entire work tree.

The got commit command requires the GOT_AUTHOR environment variable to be set, - unless an author has been configured in got.conf(5) or - Git's user.name and - user.email configuration settings can be - obtained from the repository's .git/config file - or from Git's global ~/.gitconfig configuration - file.

+ unless an author has been configured in + got.conf(5) or Git's + user.name and user.email + configuration settings can be obtained from the repository's + .git/config file or from Git's global + ~/.gitconfig configuration file.

The options for got commit are as follows:

@@ -1435,9 +1493,10 @@ Send new changes to a remote repository. If no remote-repository is specified, “origin” will be used. The remote repository's URL is - obtained from the corresponding entry in got.conf(5) or - Git's config file of the local repository, as - created by got clone. + obtained from the corresponding entry in + got.conf(5) or Git's + config file of the local repository, as created by + got clone.

All objects corresponding to new changes will be written to a temporary pack file which is then uploaded to the server. Upon success, references in the “refs/remotes/” reference namespace of @@ -1542,12 +1601,14 @@ together with the -t option.

Suppress progress reporting output. The same option will be passed to - ssh(1) if applicable.
-
+ ssh(1) if + applicable. +
Verbose mode. Causes got send to print debugging messages to standard error output. The same option will be - passed to ssh(1) if applicable. Multiple -v options - increase the verbosity. The maximum is 3.
+ passed to ssh(1) if + applicable. Multiple -v options increase the verbosity. The maximum is + 3.
@@ -2396,7 +2457,8 @@
[path ...]
Display meta-data stored in a work tree. See - got-worktree(5) for details. + got-worktree(5) for + details.

The work tree to use is resolved implicitly by walking upwards from the current working directory.

If one or more path arguments are @@ -2415,29 +2477,31 @@ and got import, for example: “Flan Hacker <flan_hacker@openbsd.org>”. - Because git(1) may fail to parse commits without an - email address in author data, got attempts to - reject GOT_AUTHOR environment variables with a - missing email address. + Because git(1) may fail to + parse commits without an email address in author data, + got attempts to reject + GOT_AUTHOR environment variables with a missing + email address.

GOT_AUTHOR will be overridden by - configuration settings in got.conf(5) or by - Git's user.name and - user.email configuration settings in the + configuration settings in got.conf(5) or by Git's user.name + and user.email configuration settings in the repository's .git/config file. The user.name and user.email configuration settings contained in Git's global ~/.gitconfig configuration file will only be - used if neither got.conf(5) nor the - GOT_AUTHOR environment variable provide author - information.

+ used if neither got.conf(5) nor the GOT_AUTHOR + environment variable provide author information.

, EDITOR
The editor spawned by got commit, got histedit, got import, or got tag. If not set, the - ed(1) text editor will be spawned in order to give - ed(1) the attention it deserves.
+ ed(1) text editor will be + spawned in order to give ed(1) the attention it deserves.
The default limit on the number of commits traversed by got log. If set to zero, the limit is unbounded. @@ -2450,17 +2514,20 @@
got.conf
Repository-wide configuration settings for got. If - present, a got.conf(5) configuration file located in the - root directory of a Git repository supersedes any relevant settings in - Git's config file. + present, a got.conf(5) + configuration file located in the root directory of a Git repository + supersedes any relevant settings in Git's config + file.

.got/got.conf
Worktree-specific configuration settings for got. - If present, a got.conf(5) configuration file in the - .got meta-data directory of a work tree supersedes - any relevant settings in the repository's got.conf(5) - configuration file and Git's config file.
+ If present, a got.conf(5) configuration file in the .got + meta-data directory of a work tree supersedes any relevant settings in the + repository's got.conf(5) configuration file and Git's + config file.
@@ -2472,7 +2539,7 @@

Enable tab-completion of got command names - in ksh(1):

+ in ksh(1):

$ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
@@ -2482,7 +2549,8 @@
$ cd /var/git/
$ got clone ssh://git@github.com/openbsd/src.git
-

Use of HTTP URLs currently requires git(1):

+

Use of HTTP URLs currently requires git(1):

$ cd /var/git/
$ git clone --bare @@ -2539,7 +2607,8 @@

$ got log -p -l 3

As above, but display changes in the order in which - patch(1) could apply them in sequence:

+ patch(1) could apply them in + sequence:

$ got log -p -l 3 -R

In a work tree or a git repository directory, log the history of a @@ -2603,8 +2672,8 @@

$ cd /usr/src
$ got fetch

In a repository created with a HTTP URL and git - clone --bare the git-fetch(1) command must be used - instead:

+ clone --bare the git-fetch(1) command must be used instead:

$ cd /var/git/src.git
$ git fetch origin @@ -2655,9 +2724,9 @@
$ cd /var/git/repo
$ git config remote.origin.mirror false
-

Alternatively, the following git-fetch(1) - configuration item can be added manually to the Git repository's - config file:

+

Alternatively, the following git-fetch(1) configuration item can be added manually to the + Git repository's config file:

[remote "origin"]
@@ -2671,9 +2740,9 @@ got branch. Branches in the “refs/remotes/origin” namespace can now be updated with incoming changes from the remote repository with got - fetch or git-fetch(1) without extra command line - arguments. Newly fetched changes can be examined with got - log.

+ fetch or git-fetch(1) without extra command line arguments. Newly fetched + changes can be examined with got log.

Display changes on the remote repository's version of the “master” branch, as of the last time got fetch was run:

@@ -2726,7 +2795,8 @@
$ got send -b master origin

If the remote repository requires the HTTPS protocol, the - git-push(1) command must be used instead:

+ git-push(1) command must + be used instead:

$ cd /var/git/src.git
$ git push origin master
@@ -2734,9 +2804,11 @@

-

gotadmin(1), tog(1), - git-repository(5), got-worktree(5), - got.conf(5)

+

gotadmin(1), + tog(1), + git-repository(5), + got-worktree(5), + got.conf(5)

@@ -2756,25 +2828,27 @@

got is a work-in-progress and some features remain to be implemented.

-

At present, the user has to fall back on git(1) - to perform some tasks. In particular:

+

At present, the user has to fall back on + git(1) to perform some tasks. + In particular:

  • Reading from remote repositories over HTTP or HTTPS protocols requires - git-clone(1) and git-fetch(1).
    • + git-clone(1) and + git-fetch(1).
  • Writing to remote repositories over HTTP or HTTPS protocols requires - git-push(1).
    • + git-push(1).
  • The creation of merge commits with more than two parent commits requires - git-merge(1).
    • + git-merge(1).
  • In situations where files or directories were moved around got will not automatically merge changes to new - locations and git(1) will usually produce better - results.
    • + locations and git(1) will + usually produce better results.
- +
June 18, 2022July 4, 2022 OpenBSD 7.1
blob - d311662c45f7485550ead82356ce77acba83a409 blob + 1a6bebdde637968f4ec6b80960da7256e891abbf --- got.conf.5.html +++ got.conf.5.html @@ -38,12 +38,12 @@

got.conf is the run-time configuration - file for got(1).

+ file for got(1).

got.conf may be present in the root directory of a Git repository for repository-wide settings, or in the .got meta-data directory of a work tree to override - repository-wide settings for got(1) commands executed - within this work tree.

+ repository-wide settings for got(1) commands executed within this work tree.

The file format is line-based, with one configuration directive per line. Any lines beginning with a ‘#’ are treated as comments and ignored.

@@ -55,10 +55,34 @@ commit and got import when operating on this repository. Author information specified here overrides the GOT_AUTHOR environment variable. -

Because git(1) may fail to parse commits - without an email address in author data, got(1) - attempts to reject author information with a missing email address.

+

Because git(1) + may fail to parse commits without an email address in author data, + got(1) attempts to reject + author information with a missing email address.

+
+ path
+
Configure a path to the "allowed signers" + file which contains a list of trusted SSH signer identities. The file will + be passed to ssh-keygen(1) during verification of SSH-based signatures with + got tag -V. The format of + the "allowed signers" file is documented in the ALLOWED SIGNERS + section of ssh-keygen(1). +

Verification of SSH-based signatures is impossible unless the + allowed_signers option is set in + got.conf.

+
+
+ path
+
Configure a path to the optional "revoked + signers" file, which contains a list of revoked SSH signer + identities. This file is passed to ssh-keygen(1) during signature verification with + got tag -V. Revoked + identities are no longer considered trustworthy and verification of + relevant signatures will fail.
name {...}
Define a remote repository. The specified name can @@ -83,15 +107,15 @@
git
The Git protocol as implemented by the - git-daemon(1) server. Use of this protocol is - discouraged since it supports neither authentication nor - encryption.
+ git-daemon(1) + server. Use of this protocol is discouraged since it supports + neither authentication nor encryption.
git+ssh
The Git protocol wrapped in an authenticated and encrypted - ssh(1) tunnel. With this protocol the hostname - may contain an embedded username for ssh(1) to - use: - user@hostname
+ ssh(1) tunnel. With + this protocol the hostname may contain an embedded username for + ssh(1) to use: + user@hostname
ssh
Short alias for git+ssh.
@@ -102,9 +126,9 @@ server. The port can be specified by number or name. The port name to number mappings are found in the file /etc/services; see - services(5) for details. If not specified, the - default port of the specified protocol will be - used. + services(5) for + details. If not specified, the default port of the specified + protocol will be used.
{branch ...}
Specify one or more branches which got fetch @@ -113,7 +137,7 @@ be overridden at the got fetch and got send command lines with the -b option.
-
+
yes | no
This option controls whether got fetch will fetch all branches from the remote repository by default. If enabled, @@ -133,7 +157,7 @@ “refs/got/” namespace. In any case, references in the “refs/tags/” namespace will always be fetched and mapped directly to local references in the same namespace.
-
+
yes | no
This option controls the behaviour of got fetch when updating references. @@ -214,7 +238,7 @@ repository "openbsd/src" server git@github.com protocol git+ssh - mirror-references yes + mirror_references yes }

Fetch changes via the Git protocol and send changes via the SSH @@ -243,16 +267,17 @@

.got/got.conf
If present, got.conf located in the .got meta-data directory of a - got(1) work tree supersedes any relevant settings in the - repository's got.conf configuration file and Git's - config file.
+ got(1) work tree supersedes + any relevant settings in the repository's got.conf + configuration file and Git's config file.

-

got(1), git-repository(5), - got-worktree(5)

+

got(1), + git-repository(5), + got-worktree(5)

@@ -267,7 +292,7 @@ - +
June 18, 2022July 4, 2022 OpenBSD 7.1
blob - bba045f2c5a26e1d1232fecf45807b7f272afdcf blob + 605dcdfaf2bc57892fe6af5b771a955e59d24ef6 --- gotadmin.1.html +++ gotadmin.1.html @@ -48,12 +48,14 @@

gotadmin is the repository maintenance - tool for the got(1) version control system.

-

got(1) stores the history of tracked files in a - Git repository, as used by the Git version control system. - gotadmin provides commands for inspecting and - manipulating the on-disk state of Git repositories. The repository format is - described in git-repository(5).

+ tool for the got(1) version + control system.

+

got(1) stores the + history of tracked files in a Git repository, as used by the Git version + control system. gotadmin provides commands for + inspecting and manipulating the on-disk state of Git repositories. The + repository format is described in git-repository(5).

gotadmin provides global and command-specific options. Global options must precede the command name, and are as follows:

@@ -70,9 +72,10 @@
[-r repository-path]
Display information about a repository. This includes some configuration - settings from got.conf(5), 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. + settings from got.conf(5), 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.

The options for gotadmin info are as follows:

@@ -80,8 +83,9 @@ repository-path
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 got(1) work tree, use the - repository path associated with this work tree.
+ this directory is a got(1) work tree, use the repository path associated with this + work tree.
@@ -112,8 +116,9 @@ repository-path
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 got(1) work tree, use the - repository path associated with this work tree.
+ this directory is a got(1) work tree, use the repository path associated with this + work tree.
reference
Exclude objects reachable via the specified @@ -139,12 +144,12 @@ Create a pack index for the pack file at packfile-path.

A pack index is required for using the corresponding pack file - with got(1). Usually, a pack index will be created by - commands such as gotadmin pack or - got fetch as part of regular operation. The - gotadmin indexpack command may be used to - recover from a corrupt or missing index. A given pack file will always - yield the same bit-identical index.

+ with got(1). Usually, a + pack index will be created by commands such as gotadmin + pack or got fetch as part of regular + operation. The gotadmin indexpack command may be + used to recover from a corrupt or missing index. A given pack file will + always yield the same bit-identical index.

The provided packfile-path must be located within the objects/pack/ directory of the repository and should end in .pack. The @@ -252,8 +257,9 @@ repository-path

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 got(1) work tree, use the - repository path associated with this work tree.
+ this directory is a got(1) work tree, use the repository path associated with this + work tree.
Suppress progress reporting and disk space summary output.
@@ -269,8 +275,10 @@

-

got(1), tog(1), - git-repository(5), got.conf(5)

+

got(1), + tog(1), + git-repository(5), + got.conf(5)

@@ -284,16 +292,19 @@

gotadmin is a work-in-progress and some features remain to be implemented.

-

At present, the user has to fall back on git(1) - to perform some tasks. In particular:

+

At present, the user has to fall back on + git(1) to perform some tasks. + In particular:

@@ -301,13 +312,14 @@

Disk space savings reported by gotadmin cleanup will be misleading if the repository contains object files that were hard-linked from another repository. Such hard-links will be - created by certain git(1) commands. By itself, - got(1) will never create hard-linked object files.

+ created by certain git(1) + commands. By itself, got(1) + will never create hard-linked object files.

- +
June 18, 2022July 4, 2022 OpenBSD 7.1
blob - e4acbb32be3e1d9ad614512d97df9e81d77a5857 blob + cf0968fd2cda0c9769a6b0cf39a6d502fcf4c317 --- gotweb.8.html +++ gotweb.8.html @@ -49,19 +49,21 @@

gotweb provides a web interface allowing Git repository contents to be viewed with a web browser.

gotweb is a CGI program based on - got(1) and kcgi(3) which is intended to - run in a chroot(2) environment in - /var/www. The program has been designed to work out - of the box with the httpd(8) web server in conjunction - with slowcgi(8).

+ got(1) and + kcgi(3) which is intended to + run in a chroot(2) + environment in /var/www. The program has been + designed to work out of the box with the httpd(8) web server in conjunction with + slowcgi(8).

Enabling gotweb requires the following steps:

    -
  1. The httpd.conf(5) configuration file must be adjusted to - run gotweb as a CGI program with - slowcgi(8). The - EXAMPLES section below contains an - appropriate configuration file sample.
    2. +
  2. The httpd.conf(5) + configuration file must be adjusted to run gotweb + as a CGI program with slowcgi(8). The EXAMPLES section + below contains an appropriate configuration file sample.
  3. httpd(8) and slowcgi(8) must be enabled and started: 
      # rcctl enable httpd slowcgi
@@ -69,19 +71,21 @@
  4. Optionally, the run-time behaviour of gotweb can - be configured via the gotweb.conf(5) configuration - file.
    5. + be configured via the gotweb.conf(5) configuration file.
  5. Git repositories must be created at a suitable location inside - the web server's chroot(2) environment. These - repositories should + the web server's chroot(2) environment. These repositories should be writable by - the user ID of the httpd(8) server. The default location - for repositories published by gotweb is + the user ID of the httpd(8) server. The default location for repositories published by + gotweb is /var/www/got/public.
  6. Git repositories served by gotweb should be kept up-to-date with a mechanism such as got fetch, - git-fetch(1), or rsync(1), scheduled - by cron(8).
    7. + git-fetch(1), or + rsync(1), scheduled by + cron(8).
@@ -90,16 +94,18 @@
/var/www/got/public/
Default location for Git repositories served by gotweb. This location can be adjusted in the - gotweb.conf(5) configuration file.
+ gotweb.conf(5) + configuration file.
/var/www/cgi-bin/gotweb/gotweb
The gotweb CGI program, statically linked for use - in a chroot(2) environment.
+ in a chroot(2) + environment.
/var/www/cgi-bin/gotweb/gw_tmpl/
Directory for template files used by gotweb.
/var/www/cgi-bin/gotweb/libexec/
-
Directory containing statically linked got(1) helper - programs which are run by gotweb to read Git - repositories.
+
Directory containing statically linked got(1) helper programs which are run by + gotweb to read Git repositories.
/var/www/htdocs/gotweb/
Directory containing HTML, CSS, and image files used by gotweb.
@@ -130,9 +136,12 @@

-

got(1), kcgi(3), - git-repository(5), gotweb.conf(5), - httpd(8), slowcgi(8)

+

got(1), + kcgi(3), + git-repository(5), + gotweb.conf(5), + httpd(8), + slowcgi(8)

@@ -145,7 +154,7 @@ - +
June 18, 2022July 4, 2022 OpenBSD 7.1
blob - e6fd7dcc486aa6183fb924f532ed1074d6b33f6b blob + 9ec3332566efce459df9b42b66c67b10217fccdf --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -38,13 +38,14 @@

gotweb.conf is the run-time configuration - file for gotweb(8).

+ file for gotweb(8).

The file format is line-based, with one configuration directive per line. Any lines beginning with a ‘#’ are treated as comments and ignored.

Paths mentioned in gotweb.conf must be relative to /var/www, the - chroot(2) environment of httpd(8).

+ chroot(2) environment of + httpd(8).

number
-
Set the maximum amount of repositories gotweb(8) will - work with.
+
Set the maximum amount of repositories gotweb(8) will work with.
number
Set the maximum amount of repositories displayed on the index screen.
@@ -83,13 +84,15 @@
path
Set the path to the directory which contains Git repositories that - gotweb(8) should publish.
+ gotweb(8) should + publish.
on | off
Set whether to display the repository owner. Displaying the owner requires owner information to be added to the config file - in the repository. gotweb(8) will parse owner - information from either a [gotweb] or a [gitweb] section. For example: + in the repository. gotweb(8) will parse owner information from either a [gotweb] or a + [gitweb] section. For example: 
[gotweb]
 owner = "Your Name"
@@ -115,7 +118,8 @@ owner = "Your Name"

These are the currently configurable items for - gotweb(8) with their default values.

+ gotweb(8) with their + default values.

 #
@@ -156,12 +160,13 @@ got_logo_url			"https://gameoftrees.org"
 

 

-
got(1), gotweb(8)

+
got(1),
+    gotweb(8)
- +
June 18, 2022July 4, 2022 OpenBSD 7.1
blob - fb2fc163ebd93b6e4fc1698b81180339dfb91cac blob + 5f552e61f99ceaacddcf18dd7282825b659e8e1d --- tog.1.html +++ tog.1.html @@ -57,7 +57,8 @@

tog is an interactive read-only browser for Git repositories. This repository format is described in - git-repository(5).

+ git-repository(5).

tog supports several types of views which display repository data:

@@ -75,7 +76,15 @@
Displays references in the repository.

tog provides global and command-specific - key bindings and options. The global key bindings are:

+ key bindings and options. Some command-specific key bindings may be prefixed + with an integer, which is denoted by N in the descriptions below, and is + used as a modifier to the operation as indicated. + tog will echo digits to the screen when count + modifiers are entered, and complete the sequence upon input of the first + non-numeric character. Count modifiers can be aborted by entering an + unmapped key. Once a compound command is executed, the operation can be + cancelled with C-g or + Backspace. The global key bindings are:

Quit tog.
@@ -83,7 +92,7 @@
Quit the view which is in focus.
Switch focus between views.
-
+
Toggle fullscreen mode for a split-screen view. tog will automatically use split-screen views if the size of the terminal window is sufficiently large.
@@ -112,38 +121,40 @@

This command is also executed if no explicit command is specified.

The key bindings for tog log are as - follows:

+ follows (N denotes optional prefixed count modifier):

-
Move the selection cursor down.
+
Move the selection cursor down N lines (default: 1).
-
Move the selection cursor up.
+
Move the selection cursor up N lines (default: 1).
-
Scroll log message field to the right. Log message moves left on the - screen.
+
Scroll log message field to the right N increments (default: 1). +
+ Log message moves left on the screen.
-
Scroll log message field to the left. Log message moves right on the - screen.
+
Scroll log message field to the left N increments (default: 1). +
+ Log message moves right on the screen.
Scroll log message field to the rightmost position.
Scroll log message field to the leftmost position.
-
Move the selection cursor down one page.
+ Space, Ctrl+f, f +
Move the selection cursor down N pages (default: 1).
-
Move the selection cursor up one page.
+ Ctrl+b, b +
Move the selection cursor up N pages (default: 1).
-
Move the selection cursor down one half page.
+
Move the selection cursor down N half pages (default: 1).
-
Move the selection cursor up one half page.
+
Move the selection cursor up N half pages (default: 1).
Move the cursor to the newest commit.
@@ -152,9 +163,9 @@
Move the cursor to the oldest commit. This will traverse all commits on the current branch which may take a long time depending on the number of commits in branch history. If needed, this operation can be - cancelled with Backspace.
-
+ cancelled with C-g or + Backspace.
+
Open a diff view showing file changes made in the currently selected commit.
@@ -170,15 +181,21 @@ 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 - re_format(7). + re_format(7).
-
Find the next commit which matches the current search pattern. - Searching continues until either a match is found or the - Backspace key is pressed.
+
Find the Nth next commit which matches the current search pattern + (default: 1). +
+ Searching continues until either a match is found or + C-g or the Backspace + key is pressed.
-
Find the previous commit which matches the current search pattern. - Searching continues until either a match is found or the - Backspace key is pressed.
+
Find the Nth previous commit which matches the current search pattern + (default: 1). +
+ Searching continues until either a match is found or + C-g or the Backspace + key is pressed.
Reload the log view with new commits found in the repository.
@@ -213,8 +230,9 @@ repository-path
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 got(1) work tree, use the - repository path associated with this work tree.
+ this directory is a got(1) work tree, use the repository path associated with this + work tree.
@@ -229,39 +247,43 @@ abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the abbreviation is unique.

The key bindings for tog diff are as - follows:

+ follows (N denotes optional prefixed count modifier):

Toggle treatment of file contents as ASCII text even if binary data was detected.
-
Scroll down.
+
Scroll down N lines (default: 1).
-
Scroll up.
+
Scroll up N lines (default: 1).
-
Scroll view to the right. Diff output moves left on the screen.
+
Scroll view to the right N increments (default: 1). +
+ Diff output moves left on the screen.
-
Scroll view to the left. Diff output moves right on the screen.
+
Scroll view to the left N increments (default: 1). +
+ Diff output moves right on the screen.
Scroll view to the rightmost position.
Scroll view left to the start of the line.
-
Scroll down one page.
+ Space, Ctrl+f, f
+
Scroll down N pages (default: 1).
-
Scroll up one page.
+ Ctrl+b, b +
Scroll up N pages (default: 1).
-
Scroll down one half page.
+
Scroll down N half pages (default: 1).
-
Scroll up one half page.
+
Scroll up N half pages (default: 1).
Scroll to the top of the view.
@@ -269,30 +291,36 @@ G
Scroll to the bottom of the view.
-
Reduce the amount of diff context lines.
+
Reduce diff context by N lines (default: 1).
-
Increase the amount of diff context lines.
+
Increase diff context by N lines (default: 1).
If the diff view was opened via the - log view, move to the previous (younger) - commit.
+ log view, move to the Nth previous (younger) + commit (default: 1).
If the diff view was opened via the - log view, move to the next (older) - commit.
+ log view, move to the Nth next (older) commit + (default: 1).
Prompt for a search pattern and start searching for matching lines. The search pattern is an extended regular expression. Regular expression syntax is documented in - re_format(7).
+ re_format(7).
-
Find the next line which matches the current search pattern.
+
Find the Nth next line which matches the current search pattern + (default: 1).
-
Find the previous line which matches the current search pattern.
+
Find the Nth previous line which matches the current search pattern + (default: 1).
Toggle display of whitespace-only changes.
+
+
Change the diff algorithm. Supported diff algorithms are Myers (quick + and dirty) and Patience (slow and tidy). This is a global setting + which also affects the blame view.

The options for tog diff are as follows:

@@ -308,8 +336,9 @@ repository-path
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 got(1) work tree, use the - repository path associated with this work tree.
+ this directory is a got(1) work tree, use the repository path associated with this + work tree.
Ignore whitespace-only changes.
@@ -320,69 +349,79 @@ path
Display line-by-line history of a file at the specified path.

The key bindings for tog blame are as - follows:

+ follows (N denotes optional prefixed count modifier):

-
Move the selection cursor down.
+
Move the selection cursor down N pages (default: 1).
-
Move the selection cursor up.
+
Move the selection cursor up N pages (default: 1).
-
Scroll view to the right. File output moves left on the screen.
+
Scroll view to the right N increments (default: 1). +
+ File output moves left on the screen.
-
Scroll view to the left. File output moves right on the screen.
+
Scroll view to the left N increments (default: 1). +
+ File output moves right on the screen.
Scroll view to the rightmost position.
Scroll view left to the start of the line.
-
Move the selection cursor down one page.
+ Space, Ctrl+f, f +
Move the selection cursor down N pages (default: 1).
-
Move the selection cursor up one page.
+ Ctrl+b, b +
Move the selection cursor up N pages (default: 1).
-
Move the selection cursor down one half page.
+
Move the selection cursor down N half pages (default: 1).
-
Move the selection cursor up one half page.
+
Move the selection cursor up N half pages (default: 1).
Move the selection cursor to the first line of the file.
Move the selection cursor to the last line of the file.
-
+
Open a diff view for the currently selected line's commit.
-
+
Reload the blame view with the version of the file as found in the currently selected line's commit.
Reload the blame view with the version of the file as found in the parent commit of the currently selected line's commit.
-
+
Reload the blame view with the previously blamed commit.
Prompt for a search pattern and start searching for matching lines. The search pattern is an extended regular expression. Regular expression syntax is documented in - re_format(7).
+ re_format(7).
-
Find the next line which matches the current search pattern.
+
Find the Nth next line which matches the current search pattern + (default: 1).
-
Find the previous line which matches the current search pattern.
+
Find the Nth previous line which matches the current search pattern + (default: 1).
+
+
Change the diff algorithm. Supported diff algorithms are Myers (quick + and dirty) and Patience (slow and tidy). This is a global setting + which also affects the diff view.

The options for tog blame are as follows:

-
+
commit
Start traversing history at the specified commit. The expected argument is the name of a @@ -393,8 +432,9 @@ repository-path
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 got(1) work tree, use the - repository path associated with this work tree.
+ this directory is a got(1) work tree, use the repository path associated with this + work tree.
@@ -426,33 +466,33 @@

Symbolic link entries are also annotated with the target path of the link.

The key bindings for tog tree are as - follows:

+ follows (N denotes optional prefixed count modifier):

-
Move the selection cursor down.
+
Move the selection cursor down N lines (default: 1).
-
Move the selection cursor up.
+
Move the selection cursor up N lines (default: 1).
-
Move the selection cursor down one page.
+ Space, Ctrl+f, f
+
Move the selection cursor down N pages (default: 1).
-
Move the selection cursor up one page.
+ Ctrl+b, b +
Move the selection cursor up N pages (default: 1).
-
Move the selection cursor down one half page.
+
Move the selection cursor down N half pages (default: 1).
-
Move the selection cursor up one half page.
+
Move the selection cursor up N half pages (default: 1).
Move the selection cursor to the first entry.
Move the selection cursor to the last entry.
-
+
Enter the currently selected directory, or switch to the blame view for the currently selected file.
@@ -465,7 +505,7 @@ tree view for arbitrary branches and tags.
-
Move back to the parent directory.
+
Move back to the Nth parent directory (default: 1).
Show object IDs for all objects displayed in the tree view.
@@ -473,18 +513,19 @@
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 re_format(7).
+ documented in re_format(7).
-
Find the next tree entry which matches the current search - pattern.
+
Find the Nth next tree entry which matches the current search pattern + (default: 1).
-
Find the previous tree entry which matches the current search - pattern.
+
Find the Nth previous tree entry which matches the current search + pattern (default: 1).

The options for tog tree are as follows:

-
+
commit
Start traversing history at the specified commit. The expected argument is the name of a @@ -495,41 +536,42 @@ repository-path
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 got(1) work tree, use the - repository path associated with this work tree.
+ this directory is a got(1) work tree, use the repository path associated with this + work tree.
[-r repository-path]
Display references in the repository.

The key bindings for tog ref are as - follows:

+ follows (N denotes optional prefixed count modifier):

-
Move the selection cursor down.
+
Move the selection cursor down N lines (default: 1).
-
Move the selection cursor up.
+
Move the selection cursor up N lines (default: 1).
-
Move the selection cursor down one page.
+ Space, Ctrl+f, f +
Move the selection cursor down N pages (default: 1).
-
Move the selection cursor up one page.
+ Ctrl+b, b +
Move the selection cursor up N pages (default: 1).
-
Move the selection cursor down one half page.
+
Move the selection cursor down N half pages (default: 1).
-
Move the selection cursor up one half page.
+
Move the selection cursor up N half pages (default: 1).
Move the selection cursor to the first reference.
Move the selection cursor to the last reference.
-
+
Open a log view which begins traversing history at the commit resolved via the currently selected reference.
@@ -548,12 +590,14 @@
Prompt for a search pattern and start searching for matching references. The search pattern is an extended regular expression which is matched against absolute reference names. Regular expression syntax - is documented in re_format(7).
+ is documented in re_format(7).
-
Find the next reference which matches the current search pattern.
+
Find the Nth next reference which matches the current search pattern + (default: 1).
-
Find the previous reference which matches the current search - pattern.
+
Find the Nth previous reference which matches the current search + pattern (default: 1).
Reload the list of references displayed by the ref view.
@@ -565,8 +609,9 @@ repository-path
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 got(1) work tree, use the - repository path associated with this work tree.
+ this directory is a got(1) work tree, use the repository path associated with this + work tree. @@ -574,6 +619,17 @@

+
+
Determines the default diff algorithm used by tog. + Supported diff algorithms are Myers (quick and dirty) and Patience (slow + and tidy). Valid values for TOG_DIFF_ALGORITHM are + “patience” and “myers”. If unset, the Myers + diff algorithm will be used by default.
+
+
Determines whether tog will use vertical or + horizontal split for split-screen views. If set to “h” then + split-screen views will be split horizontally. Otherwise, split-screen + views will be split vertically.
tog shows colorized output if this variable is set to a non-empty value. The default color scheme can be modified by setting @@ -642,8 +698,9 @@

-

got(1), git-repository(5), - re_format(7)

+

got(1), + git-repository(5), + re_format(7)

@@ -656,7 +713,7 @@ - +
June 18, 2022July 4, 2022 OpenBSD 7.1