commit 63657f42eb5781789e879bb9f2b95bcbca4e4db1 from: Stefan Sperling date: Wed Sep 07 11:03:46 2022 UTC sync man pages commit - dd675f79fe56ceed41af67f24a651b5d6f5644da commit + 63657f42eb5781789e879bb9f2b95bcbca4e4db1 blob - 6b2c66e07530a7932733f983554356edfe133619 blob + 9617ef0974234d6719c79df6a1611c2b553a04d5 --- git-repository.5.html +++ git-repository.5.html @@ -1,5 +1,11 @@ + + + + + GIT-REPOSITORY(5) + - - - - - GIT-REPOSITORY(5) - - - - - - - -
GIT-REPOSITORY(5)File Formats ManualGIT-REPOSITORY(5)
-
+
GIT-REPOSITORY(5) + File Formats Manual + GIT-REPOSITORY(5)
+
-

+

git-repository — - Git repository format

+ Git repository format

-

+

A Git repository stores a series of versioned snapshots of a file hierarchy. Conceptually, the repository's data model is a directed acyclic graph which contains three types of objects as nodes:

@@ -73,8 +70,8 @@ object's header and the data stored in the object.

-

+

Loose objects are stored as individual files beneath the directory objects, spread across 256 sub-directories named after the 256 possible hexadecimal values of the first byte of an object @@ -111,7 +108,7 @@ objects contained in the pack file.

-

+

A reference associates a name with an object ID. A prominent use of references is providing names to branches in the repository by pointing at commit objects which represent the current tip commit of a branch. @@ -139,7 +136,7 @@ gotadmin cleanup.

-

+

HEAD
A reference to the current head commit of the Git work tree. In bare @@ -191,8 +188,8 @@ bare.

-

+

got(1), gotadmin(1), deflate(3), @@ -201,13 +198,13 @@ got.conf(5)

-

+

The Git repository format was initially designed by Linus Torvalds in 2005 and has since been extended by various people involved in the development of the Git version control system.

-

+

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 @@ -215,12 +212,9 @@ users from creating reference names with a leading - (dash) character, because this is rarely intended and not considered useful.

-
- - - - - -
July 14, 2022OpenBSD 7.1
+ +
September 7, + 2022 OpenBSD 7.2
blob - 54061f0699cf4b3f3c890ea6a4a6578d8ada4b61 blob + 228a4c372c9b3ecfdc48eb29ede60f7c2d834247 --- got-worktree.5.html +++ got-worktree.5.html @@ -1,5 +1,11 @@ + + + + + GOT-WORKTREE(5) + - - - - - GOT-WORKTREE(5) - - - - - - - -
GOT-WORKTREE(5)File Formats ManualGOT-WORKTREE(5)
-
+
GOT-WORKTREE(5) + File Formats Manual + GOT-WORKTREE(5)
+
-

+

got-worktree — - Game of Trees work tree format

+ Game of Trees work tree + format

-

+

A Got stores a file hierarchy which corresponds to a versioned snapshot stored in @@ -149,7 +147,7 @@ Git repository with got ref -d.

-

+

.got
Meta-data directory where all files listed below reside.
@@ -176,8 +174,8 @@
-

+

got(1), rename(2), stat(2), @@ -186,12 +184,9 @@ git-repository(5), got.conf(5)

-
- - - - - -
July 14, 2022OpenBSD 7.1
+ +
September 7, + 2022 OpenBSD 7.2
blob - 9f9062957516a8748193b5f18c9b5595648c4671 blob + deb7b96a700baacc2986f99ccb774156ae88537c --- got.1.html +++ got.1.html @@ -1,5 +1,11 @@ + + + + + GOT(1) + - - - - - GOT(1) - - - - - - - -
GOT(1)General Commands ManualGOT(1)
-
+
GOT(1) General + Commands Manual GOT(1)
+
-

-

gotGame of - Trees

+

+

got — + Game of Trees

-

+

@@ -47,7 +43,7 @@
got
-

+

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 @@ -77,9 +73,9 @@

[-b branch] + [-I pattern] [-m message] [-r repository-path] - [-I pattern] directory
(alias: @@ -105,6 +101,13 @@
Create the specified branch instead of creating the default branch “main”. Use of this option is required if the “main” branch already exists.
+
+ pattern
+
Ignore files or directories with a name which matches the specified + 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).
message
Use the specified log message when creating the new commit. Without @@ -115,20 +118,11 @@ repository-path
Use the repository at the specified path. If not specified, assume the repository is located at or above the current working directory.
-
- pattern
-
Ignore files or directories with a name which matches the specified - 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).
- [-a] [-b - branch] [-l] - [-m] [-q] - [-v] [-R + [-almqv] [-b + branch] [-R reference] repository-URL [directory]
@@ -227,12 +221,6 @@
Suppress progress reporting output. The same option will be passed to 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.
reference
In addition to the branches and tags that will be fetched, fetch an @@ -252,16 +240,20 @@ “refs/remotes/” or “refs/got/” namespace.

+
+
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.
- [-a] [-b - branch] [-d] - [-l] [-r - repository-path] [-t] - [-q] [-v] - [-R reference] - [-X] [remote-repository]
+ [-adlqtvX] [-b + branch] [-R + reference] [-r + repository-path] + [remote-repository]
(alias: fe)
@@ -324,26 +316,10 @@ repository and exit immediately. Cannot be used together with any of the other options except -v, -q, and -r.
-
-
Allow existing references in the “refs/tags” namespace - to be updated if they have changed on the server. If not specified, - only new tag references will be created.
-
- 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 work tree, use the - repository path associated with this work tree.
Suppress progress reporting output. The same option will be passed to 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.
reference
In addition to the branches and tags that will be fetched, fetch an @@ -366,6 +342,22 @@ “refs/remotes/” or “refs/got/” namespace.

+
+ 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 work tree, use the + repository path associated with this work tree.
+
+
Allow existing references in the “refs/tags” namespace + to be updated if they have changed on the server. If not specified, + only new tag references will be created.
+
+
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.
Delete all references which correspond to a particular remote-repository instead of fetching new @@ -385,11 +377,10 @@
- [-E] [-b + [-Eq] [-b branch] [-c commit] [-p - path-prefix] [-q] - repository-path + path-prefix] repository-path [work-tree-path]
(alias: @@ -413,10 +404,6 @@

The options for got checkout are as follows:

-
-
Proceed with the checkout operation even if the directory at - work-tree-path is not empty. Existing files will - be left intact.
branch
Check out files from a commit on the specified @@ -439,6 +426,10 @@ got checkout can be used. Checking out work trees with an unknown branch is intentionally not supported.

+
+
Proceed with the checkout operation even if the directory at + work-tree-path is not empty. Existing files will + be left intact.
path-prefix
Restrict the work tree to a subset of the repository's tree hierarchy. @@ -449,9 +440,9 @@
- [-b branch] - [-c commit] - [-q] [path ...]
+ [-q] [-b + branch] [-c + commit] [path ...]
(alias: up)
@@ -553,8 +544,8 @@
- [-I] [-s - status-codes] [-S + [-I] [-S + status-codes] [-s status-codes] [path ...]
(alias: @@ -637,15 +628,6 @@
Show unversioned files even if they match an ignore pattern.
-
- status-codes
-
Only show files with a modification status matching any of the - single-character status codes contained in the - status-codes argument. Any combination of codes - from the above list of possible status codes may be specified. For - staged files, status codes displayed in either column will be matched. - Cannot be used together with the -S - option.
status-codes
Suppress the output of files with a modification status matching any @@ -655,6 +637,15 @@ staged files, status codes displayed in either column will be matched. Cannot be used together with the -s option.
+
+ status-codes
+
Only show files with a modification status matching any of the + single-character status codes contained in the + status-codes argument. Any combination of codes + from the above list of possible status codes may be specified. For + staged files, status codes displayed in either column will be matched. + Cannot be used together with the -S + option.

For compatibility with cvs(1) and git(1), @@ -674,14 +665,12 @@ “/”, in a pattern.

- [-b] [-c - commit] [-C - number] [-l - N] [-p] - [-P] [-s] - [-S search-pattern] - [-r repository-path] - [-R] [-x + [-bPpRs] [-C + number] [-c + commit] [-l + N] [-r + repository-path] [-S + search-pattern] [-x commit] [path]
Display history of a repository. If a path is specified, show only commits which modified this path. If invoked in a @@ -696,6 +685,11 @@
Display individual commits which were merged into the current branch from other branches. By default, got log shows the linear history of the current branch only.
+
+ number
+
Set the number of context lines shown in diffs with + -p. By default, 3 lines of context are + shown.
commit
Start traversing history at the specified @@ -706,11 +700,6 @@ this option is not specified, default to the work tree's current branch if invoked in a work tree, or to the repository's HEAD reference.
-
- number
-
Set the number of context lines shown in diffs with - -p. By default, 3 lines of context are - shown.
N
Limit history traversal to a given number of commits. If this option @@ -718,11 +707,6 @@ treated as an unbounded limit. The GOT_LOG_DEFAULT_LIMIT environment variable may be set to change this default value.
-
-
Display the patch of modifications made in each commit. If a - path is specified, only show the patch of - modifications at or within this path. Cannot be used with the - -s option.
Display the list of file paths changed in each commit, using the following status codes: @@ -747,10 +731,20 @@

Cannot be used with the -s option.

-
-
Display a short one-line summary of each commit, instead of the - default history format. Cannot be used together with the - -p or -P option.
+
+
Display the patch of modifications made in each commit. If a + path is specified, only show the patch of + modifications at or within this path. Cannot be used with the + -s option.
+
+
Determine a set of commits to display as usual, but display these + commits in reverse order.
+
+ 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 work tree, use the + repository path associated with this work tree.
search-pattern
If specified, show only commits with a log message, author name, @@ -761,15 +755,10 @@ -P is specified. Regular expression syntax is documented in re_format(7).
-
- 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 work tree, use the - repository path associated with this work tree.
-
-
Determine a set of commits to display as usual, but display these - commits in reverse order.
+
+
Display a short one-line summary of each commit, instead of the + default history format. Cannot be used together with the + -p or -P option.
commit
Stop traversing commit history immediately after the specified @@ -779,13 +768,11 @@
- [-a] [-c - commit] [-C - number] [-r - repository-path] [-s] - [-P] [-w] - [object1 object2 | - path ...]
+ [-aPsw] [-C + number] [-c + commit] [-r + repository-path] [object1 + object2 | path ...]
(alias: di)
@@ -807,10 +794,14 @@
Treat file contents as ASCII text even if binary data is detected.
+
+ number
+
Set the number of context lines shown in the diff. By default, 3 lines + of context are shown.
commit
-
Show differences between commits in the repository. This options may - be used up to two times. When used only once, show differences between +
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 commit and its first parent commit. When used twice, show differences between the two specified commits. @@ -825,10 +816,11 @@

Cannot be used together with the -P option.

-
- number
-
Set the number of context lines shown in the diff. By default, 3 lines - of context are shown.
+
+
Interpret all arguments as paths only. This option can be used to + resolve ambiguity in cases where paths look like tag names, reference + names, or object IDs. This option is only valid when + got diff is invoked in a work tree.
repository-path
Use the repository at the specified path. If not specified, assume the @@ -839,11 +831,6 @@
Show changes staged with got stage instead of showing local changes in the work tree. This option is only valid when got diff is invoked in a work tree.
-
-
Interpret all arguments as paths only. This option can be used to - resolve ambiguity in cases where paths look like tag names, reference - names, or object IDs. This option is only valid when - got diff is invoked in a work tree.
Ignore whitespace-only changes.
@@ -876,10 +863,9 @@
- [-c commit] - [-r repository-path] - [-i] [-R] - [path]
+ [-iR] [-c + commit] [-r + repository-path] [path]
(alias: tr)
@@ -920,25 +906,24 @@ to a commit ID. An abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the abbreviation is unique.
+
+
Show object IDs of files (blob objects) and directories (tree + objects).
+
+
Recurse into sub-directories in the repository.
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 work tree, use the repository path associated with this work tree.
-
-
Show object IDs of files (blob objects) and directories (tree - objects).
-
-
Recurse into sub-directories in the repository.
- [-r repository-path] - [-l] [-t] - [-c object] - [-s reference] - [-d] [name]
+ [-dlt] [-c + object] [-r + repository-path] [-s + reference] [name]
Manage references in a repository.

References may be listed, created, deleted, and changed. When creating, deleting, or changing a reference the specified @@ -947,25 +932,6 @@

The options for got ref are as follows:

-
- 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 work tree, use the - repository path associated with this work tree.
-
-
List references in the repository. If no name is - specified, list all existing references in the repository. If - name is a reference namespace, list all - references in this namespace. Otherwise, show only the reference with - the given name. Cannot be used together with any - other options except -r and - -t.
-
-
Sort listed references by modification time (most recently modified - first) instead of sorting by lexicographical order. Use of this option - requires the -l option to be used as - well.
object
Create a reference or change an existing reference. The reference with @@ -976,6 +942,27 @@ corresponding commit, tree, tag, or blob object. Cannot be used together with any other options except -r.
+
+
Delete the reference with the specified name + from the repository. Any commit, tree, tag, and blob objects belonging + to deleted references remain in the repository and may be removed + separately with Git's garbage collector or gotadmin + cleanup. Cannot be used together with any other options except + -r.
+
+
List references in the repository. If no name is + specified, list all existing references in the repository. If + name is a reference namespace, list all + references in this namespace. Otherwise, show only the reference with + the given name. Cannot be used together with any + other options except -r and + -t.
+
+ 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 work tree, use the + repository path associated with this work tree.
reference
Create a symbolic reference, or change an existing symbolic reference. @@ -985,21 +972,18 @@ loops between references when this option is used. Cannot be used together with any other options except -r.
-
-
Delete the reference with the specified name - from the repository. Any commit, tree, tag, and blob objects belonging - to deleted references remain in the repository and may be removed - separately with Git's garbage collector or gotadmin - cleanup. Cannot be used together with any other options except - -r.
+
+
Sort listed references by modification time (most recently modified + first) instead of sorting by lexicographical order. Use of this option + requires the -l option to be used as + well.
- [-c commit] - [-r repository-path] - [-l] [-t] - [-d name] - [-n] [name]
+ [-lnt] [-c + commit] [-d + name] [-r + repository-path] [name]
(alias: br)
@@ -1065,12 +1049,16 @@ commit argument is a commit ID SHA1 hash or an existing reference or tag name which will be resolved to a commit ID.
-
- 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 work tree, use the - repository path associated with this work tree.
+
+ name
+
Delete the branch with the specified name from + the “refs/heads” or “refs/remotes” + reference namespace. +

Only the branch reference is deleted. Any commit, tree, + and blob objects belonging to the branch remain in the repository + and may be removed separately with Git's garbage collector or + gotadmin cleanup.

+
List all existing branches in the repository, including copies of remote repositories' branches in the “refs/remotes/” @@ -1088,6 +1076,15 @@
+
+
Do not switch and update the work tree after creating a new + branch.
+
+ 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 work tree, use the + repository path associated with this work tree.
Sort listed branches by modification time (most recently modified first) instead of sorting by lexicographical order. Branches in the @@ -1095,28 +1092,14 @@ branches in “refs/remotes/” regardless. Use of this option requires the -l option to be used as well.
-
- name
-
Delete the branch with the specified name from - the “refs/heads” or “refs/remotes” - reference namespace. -

Only the branch reference is deleted. Any commit, tree, - and blob objects belonging to the branch remain in the repository - and may be removed separately with Git's garbage collector or - gotadmin cleanup.

-
-
-
Do not switch and update the work tree after creating a new - branch.
- [-c commit] - [-m message] - [-r repository-path] - [-l] [-s - signer-id] [-v] - [-V] name
+ [-lVv] [-c + commit] [-m + message] [-r + repository-path] [-s + signer-id] name
Manage tags in a repository.

Tags are managed via references which live in the “refs/tags/” reference namespace. The got @@ -1141,6 +1124,10 @@ existing reference or tag name which will be resolved to a commit ID. An abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the abbreviation is unique.

+
+
List all existing tags in the repository instead of creating a new + tag. If a name argument is passed, show only the + tag with the given name.
message
Use the specified tag message when creating the new tag. Without the @@ -1153,10 +1140,6 @@ repository is located at or above the current working directory. If this directory is a got work tree, use the repository path associated with this work tree.
-
-
List all existing tags in the repository instead of creating a new - 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 @@ -1167,16 +1150,11 @@ ssh-agent(1). got tag will sign the tag object by invoking ssh-keygen(1) - with the -Y sign + 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. @@ -1184,12 +1162,17 @@

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

+
+
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.

By design, the got tag command will not delete tags or change existing tags. If a tag must be deleted, the @@ -1198,26 +1181,24 @@ copied to another repository.

- [-R] [-I] - path ...
+ [-IR] path ...
Schedule unversioned files in a work tree for addition to the repository in the next commit. By default, files which match a got status ignore pattern will not be added.

The options for got add are as follows:

+
+
Add files even if they match a got status + ignore pattern.
Permit recursion into directories. If this option is not specified, got add will refuse to run if a specified path is a directory.
-
-
Add files even if they match a got status - ignore pattern.
- [-f] [-k] - [-R] [-s + [-fkR] [-s status-codes] path ...
(alias: @@ -1258,9 +1239,9 @@
- [-n] [-p - strip-count] [-R] - [patchfile]
+ [-nR] [-c + commit] [-p + strip-count] [patchfile]
(alias: pa)
@@ -1322,6 +1303,28 @@

The options for got patch are as follows:

+
+ commit
+
Attempt to locate files within the specified + commit for use as a merge-base for 3-way merges. + Ideally, the specified commit should contain + versions of files which the changes contained in the + patchfile were based on. Files will be located + by path, relative to the repository root. If the + -p option is used then leading path components + will be stripped before paths are looked up in the repository. +

If the -c option is not used then + got patch will attempt to locate merge-bases + via object IDs found in patchfile meta-data, + such as produced by got diff or + git-diff(1). Use + of the -c option is only recommended in the + absence of such meta-data.

+

In case no merge-base is available for a file, changes + will be applied without doing a 3-way merge. Changes which do not + apply cleanly may then be rejected entirely, rather than producing + merge conflicts in the patched target file.

+
Do not make any modifications to the work tree. This can be used to check whether a patch would apply without issues. If the @@ -1340,9 +1343,8 @@
- [-p] [-F - response-script] [-R] - path ...
+ [-pR] [-F + response-script] path ...
(alias: rv)
@@ -1356,6 +1358,12 @@

The options for got revert are as follows:

+
+ response-script
+
With the -p option, read “y”, + “n”, and “q” responses line-by-line from + the specified response-script file instead of + prompting interactively.
Instead of reverting all changes in files, interactively select or reject changes to revert based on “y” (revert change), @@ -1364,12 +1372,6 @@ patches derived from the modified file content can be reverted. Files in added or deleted status may only be reverted in their entirety.
-
- response-script
-
With the -p option, read “y”, - “n”, and “q” responses line-by-line from - the specified response-script file instead of - prompting interactively.
Permit recursion into directories. If this option is not specified, got revert will refuse to run if a specified @@ -1377,10 +1379,10 @@
- [-F path] - [-m message] - [-N] [-S] - [path ...]
+ [-NS] [-A + author] [-F + path] [-m + message] [path ...]
(alias: ci)
@@ -1433,6 +1435,20 @@

The options for got commit are as follows:

+
+ author
+
Set author information in the newly created commit to + author. This is useful when committing changes + which were written by someone else. The author + argument must use the same format as the + GOT_AUTHOR environment variable. +

In addition to storing author information, the newly + created commit object will retain “committer” + information which is obtained, as usual, from the + GOT_AUTHOR environment variable, or + got.conf(5), or + Git configuration settings.

+
path
Use the prepared log message stored in the file found at @@ -1471,13 +1487,11 @@ local changes with changes made in the repository.

- [-a] [-b + [-afqTv] [-b branch] [-d - branch] [-f] - [-r repository-path] - [-t tag] - [-T] [-q] - [-v] [remote-repository]
+ branch] [-r + repository-path] [-t + tag] [remote-repository]
(alias: se)
@@ -1562,12 +1576,22 @@ risks of creating inconsistencies between different repositories should also be taken into account.

+
+
Suppress progress reporting output. The same option will be passed to + ssh(1) if + applicable.
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 work tree, use the repository path associated with this work tree.
+
+
Attempt to send all tags from the local repository's + “refs/tags/” reference namespace. The + -T option is equivalent to listing all tags + with multiple -t options. Cannot be used + together with the -t option.
tag
Send the specified tag from the local @@ -1584,16 +1608,6 @@

Cannot be used together with the -T option.

-
-
Attempt to send all tags from the local repository's - “refs/tags/” reference namespace. The - -T option is equivalent to listing all tags - with multiple -t options. Cannot be used - together with the -t option.
-
-
Suppress progress reporting output. The same option will be passed to - ssh(1) if - applicable.
Verbose mode. Causes got send to print debugging messages to standard error output. The same option will be @@ -1718,9 +1732,7 @@ contain merge conflicts, these conflicts must be resolved first.

- [-a] [-c] - [-l] [-X] - [branch]
+ [-aclX] [branch]
(alias: rb)
@@ -1747,7 +1759,12 @@ branch, but with different commit IDs. Once rebasing has completed successfully, the temporary branch becomes the new version of the specified branch and the work - tree is automatically switched to it.

+ tree is automatically switched to it. If author information is available + via the GOT_AUTHOR environment variable, + got.conf(5) or Git's + user.name and user.email + configuration settings, this author information will be used to identify + the “committer” of rebased commits.

Old commits in their pre-rebase state are automatically backed up in the “refs/got/backup/rebase” reference namespace. As long as these references are not removed older versions of rebased @@ -1807,11 +1824,13 @@ merged change into a no-op change, the corresponding commit will be elided when the rebase operation continues.

got rebase will refuse to run if - 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 got update. If changes have been - staged with got stage, these changes must first - be committed with got commit or unstaged with + certain preconditions are not met. If the branch + is not in the “refs/heads/” reference namespace, the + branch may not be rebased. 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 got update. If changes have been staged + with got stage, these changes must first be + committed with got commit or unstaged with got unstage. If the work tree contains local changes, these changes must first be committed with got commit or reverted with got revert. If @@ -1833,7 +1852,7 @@

Abort an interrupted rebase operation. If this option is used, no other command-line arguments are allowed.
-
+
Continue an interrupted rebase operation. If this option is used, no other command-line arguments are allowed.
@@ -1874,16 +1893,21 @@
- [-a] [-c] - [-e] [-f] - [-F histedit-script] - [-m] [-l] - [-X] [branch]
+ [-aceflmX] [-F + histedit-script] [branch]
(alias: he)
Edit commit history between the work tree's current base commit and the tip commit of the work tree's current branch. +

The got histedit 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.

Before starting a histedit operation, the work tree's current branch must be set with got update -b to the branch which should be edited, unless this @@ -2032,7 +2056,7 @@

Abort an interrupted histedit operation. If this option is used, no other command-line arguments are allowed.
-
+
Continue an interrupted histedit operation. If this option is used, no other command-line arguments are allowed.
@@ -2042,21 +2066,15 @@ -e option can only be used when starting a new histedit operation. If this option is used, no other command-line arguments are allowed. -
-
Fold all commits into a single commit. This option is a quick - equivalent to a histedit script which folds all commits, combining - them all into one commit. The -f option can - only be used when starting a new histedit operation. If this option is - used, no other command-line arguments are allowed.
histedit-script
Use the specified histedit-script instead of opening a temporary file in an editor where a histedit script can be written.
-
-
Edit log messages only. This option is a quick equivalent to a - histedit script which edits only log messages but otherwise leaves - every picked commit as-is. The -m option can +
+
Fold all commits into a single commit. This option is a quick + equivalent to a histedit script which folds all commits, combining + them all into one commit. The -f option can only be used when starting a new histedit operation. If this option is used, no other command-line arguments are allowed.
@@ -2078,6 +2096,12 @@ histedit
does not require a work tree. None of the other options can be used together with -l.

+
+
Edit log messages only. This option is a quick equivalent to a + histedit script which edits only log messages but otherwise leaves + every picked commit as-is. The -m option can + only be used when starting a new histedit operation. If this option is + used, no other command-line arguments are allowed.
Delete backups created by past histedit operations, represented by references in the “refs/got/backup/histedit” reference @@ -2150,8 +2174,7 @@ reverted with got revert.

- [-a] [-c] - [-n] [branch]
+ [-acn] [branch]
(alias: mg)
@@ -2254,7 +2277,7 @@
Abort an interrupted merge operation. If this option is used, no other command-line arguments are allowed.
-
+
Continue an interrupted merge operation. If this option is used, no other command-line arguments are allowed.
@@ -2266,9 +2289,8 @@
- [-l] [-p] - [-F response-script] - [-S] [path ...]
+ [-lpS] [-F + response-script] [path ...]
(alias: sg)
@@ -2312,6 +2334,12 @@

The options for got stage are as follows:

+
+ response-script
+
With the -p option, read “y”, + “n”, and “q” responses line-by-line from + the specified response-script file instead of + prompting interactively.
Instead of staging new changes, list paths which are already staged, along with the IDs of staged blob objects and stage status codes. If @@ -2325,12 +2353,6 @@ 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.
-
- response-script
-
With the -p option, read “y”, - “n”, and “q” responses line-by-line from - the specified response-script file instead of - prompting interactively.
Allow staging of symbolic links which point outside of the path space that is under version control. By default, got @@ -2398,6 +2420,12 @@

The options for got unstage are as follows:

+
+ response-script
+
With the -p option, read “y”, + “n”, and “q” responses line-by-line from + the specified response-script file instead of + prompting interactively.
Instead of unstaging the entire content of a changed file, interactively select or reject changes for unstaging based on @@ -2406,18 +2434,12 @@ If a file is staged in modified status, individual patches derived from the staged file content can be unstaged. Files staged in added or deleted status may only be unstaged in their entirety.
-
- response-script
-
With the -p option, read “y”, - “n”, and “q” responses line-by-line from - the specified response-script file instead of - prompting interactively.
- [-c commit] - [-r repository-path] - [-P] arg ...
+ [-P] [-c + commit] [-r + repository-path] arg ...
Parse and print contents of objects to standard output in a line-based text format. Content of commit, tree, and tag objects is printed in a way similar to the actual content stored in such objects. Blob object contents @@ -2434,7 +2456,7 @@

The options for got cat are as follows:

-
+
commit
Look up paths in the specified commit. If this option is not used, paths are looked up in the commit resolved via the @@ -2442,16 +2464,16 @@ hash or an existing reference or tag name which will be resolved to a commit ID. An abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the abbreviation is unique.
+
+
Interpret all arguments as paths only. This option can be used to + resolve ambiguity in cases where paths look like tag names, reference + names, or object IDs.
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 work tree, use the repository path associated with this work tree.
-
-
Interpret all arguments as paths only. This option can be used to - resolve ambiguity in cases where paths look like tag names, reference - names, or object IDs.
@@ -2470,15 +2492,17 @@
-

+

-
The author's name and email address for got commit - and got import, for example: - “Flan Hacker +
The author's name and email address, such as “Flan + Hacker <flan_hacker@openbsd.org>”. - Because git(1) may fail to - parse commits without an email address in author data, + Used by the got commit, got + import, got rebase, and + got histedit commands. 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. @@ -2507,10 +2531,13 @@ got log. If set to zero, the limit is unbounded. This variable will be silently ignored if it is set to a non-numeric value.
+
+
If this variable is set then any remote repository definitions or author + information found in Git configuration files will be ignored.
-

+

got.conf
Repository-wide configuration settings for got. If @@ -2531,13 +2558,13 @@
-

+

The got utility exits 0 on success, and >0 if an error occurs.

-

+

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

@@ -2800,10 +2827,84 @@

$ cd /var/git/src.git
$ git push origin master
+

When making contributions to projects which use the “pull + request” workflow, SSH protocol repository access needs to be set up + first. Once an account has been created on a Git hosting site it should be + possible to upload a public SSH key for repository access + authentication.

+

The “pull request” workflow will usually involve two + remote repositories. In the real-life example below, the + “origin” repository was forked from the + “upstream” repository by using the Git hosting site's web + interface. The got.conf(5) file in the local repository describes both remote + repositories:

+
+
# Jelmers's repository, which accepts pull requests
+remote "upstream" {
+	server git@github.com
+	protocol ssh
+	repository "/jelmer/dulwich"
+	branch { "master" }
+}
+
+# Stefan's fork, used as the default remote repository
+remote "origin" {
+	server git@github.com
+	protocol ssh
+	repository "/stspdotname/dulwich"
+	branch { "master" }
+}
+
+

With this configuration, Stefan can create commits on + “refs/heads/master” and send them to the + “origin” repository by running:

+

+
$ got send -b master + origin
+

The changes can now be proposed to Jelmer by opening a pull + request via the Git hosting site's web interface. If Jelmer requests further + changes to be made, additional commits can be created on the + “master” branch and be added to the pull request by running + got send again.

+

If Jelmer prefers additional commits to be + “squashed” then the following commands can be used to achieve + this:

+

+
$ got update -b master
+
$ got update -c + origin/master
+
$ got histedit -f
+
$ got send -f -b master + origin
+

Once Jelmer has accepted the pull request, Stefan can fetch the + merged changes, and possibly several other new changes, by running:

+

+
$ got fetch upstream
+

The merged changes will now be visible under the reference + “refs/remotes/upstream/master”. The local + “master” branch can now be rebased on top of the latest + changes from upstream:

+

+
$ got update -b + upstream/master
+
$ got rebase master
+

As a final step, the forked repository's copy of the master branch + needs to be kept in sync by sending the new changes there:

+

+
$ got send -f -b master + origin
+

If multiple pull requests need to be managed in parallel, a + separate branch must be created for each pull request with + got branch. Each such branch can then be used as + above, in place of “refs/heads/master”. Changes for any + accepted pull requests will still appear under + “refs/remotes/upstream/master,” regardless of which branch was + used in the forked repository to create a pull request.

-

+

gotadmin(1), tog(1), git-repository(5), @@ -2812,7 +2913,7 @@ gotweb(8)

-

+

Anthony J. Bentley <bentley@openbsd.org>
@@ -2869,7 +2970,7 @@ code under copyright by:


- Caldera International Inc. + Caldera International
Daniel Hartmeier
@@ -2910,7 +3011,7 @@ Austin Appleby

-

+

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

At present, the user has to fall back on @@ -2930,12 +3031,9 @@ usually produce better results.

-
- - - - - -
July 14, 2022OpenBSD 7.1
+ +
September 7, + 2022 OpenBSD 7.2
blob - b02502269266bd342d90d94ed629d0b2c1f2f063 blob + 727f28bf52d0747b8c3739866167e5c30b5f852b --- got.conf.5.html +++ got.conf.5.html @@ -1,5 +1,11 @@ + + + + + GOT.CONF(5) + - - - - - GOT.CONF(5) - - - - - - - -
GOT.CONF(5)File Formats ManualGOT.CONF(5)
-
+
GOT.CONF(5) File + Formats Manual GOT.CONF(5)
+
-

-

got.confGame of - Trees configuration file

+

+

got.conf — + Game of Trees configuration + file

-

+

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

got.conf may be present in the root @@ -227,7 +224,7 @@

-

+

Configure author information:

author "Flan Hacker <flan_hacker@openbsd.org>"
@@ -267,7 +264,7 @@
-

+

got.conf
If present, got.conf located in the root directory @@ -284,14 +281,14 @@
-

+

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

-

+

got.conf offers no way to configure the editor spawned by got commit, got histedit, got import, or got @@ -300,12 +297,9 @@ users. Users should set their VISUAL or EDITOR environment variables instead.

-
- - - - - -
July 14, 2022OpenBSD 7.1
+ +
September 7, + 2022 OpenBSD 7.2
blob - 38061b789ea565df7f11bb3a0d7b0ba4556b510a blob + 7a9098625780fda11673b8230946c37ceac4c68d --- gotadmin.1.html +++ gotadmin.1.html @@ -1,5 +1,11 @@ + + + + + GOTADMIN(1) + - - - - - GOTADMIN(1) - - - - - - - -
GOTADMIN(1)General Commands ManualGOTADMIN(1)
-
+
GOTADMIN(1) + General Commands Manual + GOTADMIN(1)
+
-

-

gotadminGame of - Trees repository administration

+

+

gotadmin — + Game of Trees repository + administration

-

+

@@ -46,7 +44,7 @@
gotadmin
-

+

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

@@ -98,10 +96,9 @@
- [-a] [-r + [-aq] [-r repository-path] [-x - reference] [-q] - [reference ...]
+ reference] [reference ...]
Generate a new pack file and a corresponding pack file index. By default, add any loose objects which are reachable via any references to the generated pack file. @@ -121,6 +118,8 @@
Add objects to the generated pack file even if they are already packed in a different pack file. Unless this option is specified, only loose objects will be added.
+
+
Suppress progress reporting output.
repository-path
Use the repository at the specified path. If not specified, assume the @@ -141,8 +140,6 @@ appears in both the included and excluded lists, it will be excluded.

-
-
Suppress progress reporting output.
@@ -166,8 +163,7 @@ ends in .idx.

- [-h] [-s] - packfile-path
+ [-hs] packfile-path
(alias: ls)
@@ -196,9 +192,8 @@
- [-a] [-p] - [-n] [-r - repository-path] [-q]
+ [-anpq] [-r + repository-path]
(alias: cl)
@@ -256,12 +251,14 @@ prevent race conditions with other commands that add new objects to the repository while gotadmin cleanup is running.
-
-
Instead of purging unreferenced loose objects, remove any pack index - files which do not have a corresponding pack file.
Display the usual progress output and summary information but do not actually remove any files from disk.
+
+
Instead of purging unreferenced loose objects, remove any pack index + files which do not have a corresponding pack file.
+
+
Suppress progress reporting and disk space summary output.
repository-path
Use the repository at the specified path. If not specified, assume the @@ -269,28 +266,26 @@ 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.
-

+

The gotadmin utility exits 0 on success, and >0 if an error occurs.

-

+

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

-

+

Christian Weisgerber <naddy@openbsd.org>
@@ -310,7 +305,7 @@ <tracey@traceyemery.net>

-

+

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

At present, the user has to fall back on @@ -329,7 +324,7 @@

-

+

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 @@ -337,12 +332,9 @@ commands. By itself, got(1) will never create hard-linked object files.

-
- - - - - -
July 14, 2022OpenBSD 7.1
+ +
September 7, + 2022 OpenBSD 7.2
blob - f4d494324343ec006be3e28a28938d472990e7ff blob + eddcb60ecccf272587ca9f63b3b31c7991edf1da --- gotweb.8.html +++ gotweb.8.html @@ -1,5 +1,11 @@ + + + + + GOTWEB(8) + - - - - - GOTWEB(8) - - - - - - - -
GOTWEB(8)System Manager's ManualGOTWEB(8)
-
+
GOTWEB(8) System + Manager's Manual GOTWEB(8)
+
-

-

gotwebGame of - Trees Git repository server for web browsers

+

+

gotweb — + Game of Trees Git repository server for + web browsers

-

+

@@ -45,7 +42,7 @@
gotweb
-

+

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

gotweb is a CGI program based on @@ -89,7 +86,7 @@

-

+

/var/www/got/public/
Default location for Git repositories served by @@ -115,7 +112,7 @@
-

+

Example configuration for httpd.conf:

@@ -134,8 +131,8 @@
 
-

+

got(1), kcgi(3), git-repository(5), @@ -144,7 +141,7 @@ slowcgi(8)

-

+

Christian Weisgerber <naddy@openbsd.org>
@@ -163,12 +160,9 @@ Tracey Emery <tracey@traceyemery.net>

-
- - - - - -
July 14, 2022OpenBSD 7.1
+ +
September 7, + 2022 OpenBSD 7.2
blob - d889515e2af00857e523a67b847195a5d15cfed8 blob + 72506c6f4c5c769126cd7de604529e684b0e22fc --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -1,5 +1,11 @@ + + + + + GOTWEB.CONF(5) + - - - - - GOTWEB.CONF(5) - - - - - - - -
GOTWEB.CONF(5)File Formats ManualGOTWEB.CONF(5)
-
+
GOTWEB.CONF(5) + File Formats Manual + GOTWEB.CONF(5)
+
-

+

gotweb.conf — - gotweb configuration file

+ gotweb configuration file

-

+

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

The file format is line-based, with one configuration directive @@ -48,8 +45,8 @@ httpd(8).

-

+

The available configuration directives are as follows:

@@ -116,7 +113,7 @@ owner = "Your Name"
-

+

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

@@ -150,7 +147,7 @@ got_logo_url "https://gameoftrees.org"
-

+

/var/www/etc/gotweb.conf
Location of the gotweb.conf configuration @@ -158,17 +155,14 @@ got_logo_url "https://gameoftrees.org"
-

+

got(1), gotweb(8)

- - - - - - -
July 14, 2022OpenBSD 7.1
+ +
September 7, + 2022 OpenBSD 7.2
blob - /dev/null blob + 9cefe6e7779507fef4b3ff0692ed274ede7d67a1 (mode 644) --- /dev/null +++ gotwebd.8.html @@ -0,0 +1,164 @@ + + + + + + + GOTWEBD(8) + + + +
GOTWEBD(8) + System Manager's Manual + GOTWEBD(8)
+
+
+

+

gotwebd — + Game of Trees Git Fast-CGI repository + server for web browsers

+
+
+

+ + + + + +
gotwebd
+
+
+

+

gotwebd is a Fast-CGI server program which + can display the contents of Git repositories via a web browser. The program + has been designed to work out of the box with the + httpd(8) web server.

+

Enabling gotwebd requires the following + steps:

+
    +
  1. The httpd.conf(5) + configuration file must be adjusted to run gotwebd + as a Fast-CGI helper program. The + EXAMPLES section below contains an + appropriate configuration file sample.
  2. +
  3. httpd(8) must be enabled and started: +
    +
      # rcctl enable httpd
    +  # rcctl start httpd
    +
    +
  4. +
  5. Optionally, the run-time behaviour of gotwebd can + be configured via the gotwebd.conf(5) configuration file.
  6. +
  7. Git repositories must be created at a suitable location inside + the web server's chroot(2) environment. These repositories should + be writable by + the user ID shared between gotwebd and + httpd(8). The default + location for repositories published by gotwebd is + /var/www/got/public.
  8. +
  9. Git repositories served by gotwebd should be kept + up-to-date with a mechanism such as got fetch, + git-fetch(1), or + rsync(1), scheduled by + cron(8).
  10. +
+
+
+

+
+
/var/www/got/public/
+
Default location for Git repositories served by + gotwebd. This location can be adjusted in the + gotwebd.conf(5) + configuration file.
+
/var/www/bin/gotwebd/
+
Directory containing statically linked got(1) helper programs which are run by + gotwebd to read Git repositories.
+
/var/www/htdocs/gotwebd/
+
Directory containing HTML, CSS, and image files used by + gotwebd.
+
/tmp/
+
Directory for temporary files created by + gotwebd.
+
+
+
+

+

Example configuration for httpd.conf:

+
+
  types { include "/usr/share/misc/mime.types" }
+
+  # one gotwebd reachable at http://gotweb1.example.com/
+  server "gotweb1.example.com" {
+        listen on * port 80
+        root "/htdocs/gotwebd"
+        location "/" {
+              fastcgi socket tcp localhost 9000
+        }
+  }
+
+  # hosting multiple gotwebd instances on the same HTTP server:
+  # http://gotweb2.example.com/gotwebd-unix/
+  # http://gotweb2.example.com/gotwebd-tcp/
+  server "gotweb2.example.com" {
+        listen on * port 80
+        location "/gotwebd-unix/" {
+              fastcgi socket "/run/gotweb.sock"
+        }
+        location "/gotwebd-unix/*" {
+               root "/htdocs/gotwebd"
+               request strip 1
+        }
+        location "/gotwebd-tcp/" {
+              fastcgi socket tcp 127.0.0.1 9000
+        }
+        location "/gotwebd-tcp/*" {
+               root "/htdocs/gotwebd"
+               request strip 1
+        }
+  }
+
+
+
+

+

got(1), + git-repository(5), + gotwebd.conf(5), + httpd(8)

+
+
+

+

Omar Polo + <op@openbsd.org> +
+ Stefan Sperling + <stsp@openbsd.org> +
+ Tracey Emery + <tracey@traceyemery.net>

+
+
+
September 7, + 2022 OpenBSD 7.2
+ + blob - /dev/null blob + 49020bc65c1067a3145c83bfc9eff9cb379fc8dc (mode 644) --- /dev/null +++ gotwebd.conf.5.html @@ -0,0 +1,239 @@ + + + + + + + GOTWEBD.CONF(5) + + + +
GOTWEBD.CONF(5) + File Formats Manual + GOTWEBD.CONF(5)
+
+
+

+

gotwebd.conf — + gotwebd configuration file

+
+
+

+

gotwebd.conf is the run-time configuration + file for gotwebd(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 gotwebd.conf must be + relative to /var/www, the + chroot(2) environment of + httpd(8).

+
+
+

+

The available global configuration directives are as follows:

+
+
+ path
+
Set the path to the the chroot(2) environment of httpd(8). If not specified then /var/www + will be used.
+
+ number
+
Run the specified number of server processes.
+
+ on | off
+
Controls whether the servers will listen on unix sockets by default.
+
+ path
+
Set the path to the default unix socket.
+
+
+
+

+

At least one server context must exist for + gotwebd(8) to function. In + case no server context is defined in the configuration file, a default + server context will be used, which listens on a unix socket at + /var/www/run/gotweb.sock and uses default parameters + for all applicable settings.

+

A server context is declared with a unique + name, followed by server-specific configuration + directives inside curly braces:

+

server name + {...}

+

gotwebd(8) is + compatible with TLS Server Name Indication (SNI), provided the + name of a server defined in + gotwebd.conf corresponds to the name of a server + defined in httpd.conf(5).

+

The available server configuration directives are as follows:

+
+
+ path
+
Set the path to a custom Cascading Style Sheet (CSS) to be used. If this + option is not specified then a default style sheet will be used.
+
address port + number
+
Configure an address and port for incoming FCGI TCP connections. Valid + address arguments are hostnames, IP4 addresses, IPv6 + addresses, and network interface names. The port + argument may be number or a service name defined in + services(5). +

May be specified multiple times to build up a list of + listening sockets. However, a given combination of address and port may + only be used by one server.

+
+ +
Set the path to an image file containing a logo to be displayed.
+
+ url
+
Set a hyperlink for the logo.
+
+ number
+
Set the maximum amount of commits displayed per page.
+
+ number
+
Set the maximum amount of repositories gotwebd(8) will work with.
+
+ number
+
Set the maximum amount of repositories displayed on the index screen.
+
+ path
+
Set the path to the directory which contains Git repositories that the + server should publish.
+
+ on | off
+
Toggle display of last repository modification date.
+
+ on | off
+
Toggle display of clone URLs for a repository. This requires the creation + of a cloneurl file inside the repository which + contains one URL per line.
+
+ on | off
+
Toggle display of the repository description. The + description file in the repository should be + updated with an appropriate description.
+
+ 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. gotwebd(8) will parse owner information from either a [gotweb] or a + [gitweb] section. For example: +
+
[gotweb]
+owner = "Your Name"
+
+
+ +
Set the displayed site link name for the index page.
+
+ string
+
Set the displayed site name title.
+
+ string
+
Set the displayed site owner.
+
+ on | off
+
Toggle display of the site owner.
+
+ on | off
+
Enable or disable use of unix sockets.
+
+ path
+
Set the path to the unix socket used by the server.
+
+
+
+

+

These are the currently configurable items for + gotwebd(8) with their + default values.

+
+
#
+# gotwebd options
+# all paths relative to /var/www (httpd chroot jail)
+#
+
+prefork 1
+
+server "localhost-unix" {
+	repos_path "/got/public"
+	unix_socket_name "/run/gotweb.sock"
+
+	got_site_name   "my public repos"
+	got_site_owner   "Got Owner"
+	got_site_link   "repos"
+
+	logo   "got.png"
+	logo_url   "https://gameoftrees.org"
+
+	# on by default
+	#show_site_owner  off
+	#show_repo_owner  off
+	#show_repo_age  false
+	#show_repo_description no
+	#show_repo_cloneurl  off
+
+	#max_repos   100
+	#max_repos_display  25
+	#max_commits_display  50
+}
+
+# Example server context for FCGI over TCP connections:
+#server "localhost-tcp" {
+#	repos_path "/got/public"
+#	unix_socket		off
+#	listen on 127.0.0.1 port 9000
+#	listen on ::1 port 9000
+#}
+
+
+
+

+
+
/var/www/etc/gotweb.conf
+
Location of the gotwebd.conf configuration + file.
+
+
+
+

+

got(1), + httpd.conf(5), + services(5), + gotwebd(8), + httpd(8)

+
+
+
September 7, + 2022 OpenBSD 7.2
+ + blob - c4f64310ce9769efffc0e169f8e61f07c1abe383 blob + 32c7e93cb3250e884ca4b8c8543069ea825fba2a --- sync-man.sh +++ sync-man.sh @@ -10,5 +10,9 @@ $CONVERT $HOME/src/got/tog/tog.1 > ./tog.1.html for f in gotweb.8 gotweb.conf.5; do $CONVERT $HOME/src/got/gotweb/$f > ./${f}.html done +for f in gotwebd.8 gotwebd.conf.5; do + $CONVERT $HOME/src/got/gotwebd/$f > ./${f}.html +done + got st blob - 8d96cac194d2dacbbb37d0c6b90ee050a203ed3f blob + 9f20805def69b9cf49642caad3a3384ae76ab3c4 --- tog.1.html +++ tog.1.html @@ -1,5 +1,11 @@ + + + + + TOG(1) + - - - - - TOG(1) - - - - - - - -
TOG(1)General Commands ManualTOG(1)
-
+
TOG(1) General + Commands Manual TOG(1)
+
-

-

togGit - repository browser

+

+

tog — + Git repository browser

-

+

@@ -54,7 +50,7 @@
tog
-

+

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

When in a split-screen view, increase the size of the focussed split N increments (default: 1).
+
+
Go to line N in the view (default: last line).
+
+
Go to line N in the view (default: first line).

Global options must precede the command name, and are as follows:

@@ -180,7 +180,7 @@
Open a diff view showing file changes made in the currently selected commit.
-
+
Open a tree view showing the tree for the currently selected commit.
@@ -215,10 +215,12 @@
Reload the log view and toggle display of merged commits. The -b option determines whether merged commits are displayed initially.
-
+
Open a ref view listing all references in the repository. This can then be used to open a new log view for arbitrary branches and tags.
+
+
Toggle between showing the author and the committer name.

The options for tog log are as follows:

@@ -238,7 +240,7 @@ is unique. If this option is not specified, default to the work tree's current branch if invoked in a work tree, or to the repository's HEAD reference. -
+
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 @@ -248,10 +250,10 @@
- [-a] [-C + [-aw] [-C number] [-r - repository-path] [-w] - object1 object2
+ repository-path] object1 + object2
Display the differences between two objects in the repository. Treat each of the two arguments as a reference, a tag name, or an object ID SHA1 hash, and display differences between the corresponding objects. Both @@ -302,19 +304,27 @@
Scroll to the bottom of the view.
-
-
Reduce diff context by N lines (default: 1).
-
+
+
Navigate to the Nth previous file in the diff (default: 1).
+
+
Navigate to the Nth next file in the diff (default: 1).
+
+
Navigate to the Nth previous hunk in the diff (default: 1).
+
+
Navigate to the Nth next hunk in the diff (default: 1).
+
+
Reduce diff context by N lines (default: 1).
+
Increase diff context by N lines (default: 1).
-
+
If the diff view was opened via the log view, move to the Nth previous (younger) commit. If the diff was opened via the blame view, move to the Nth previous line and load the corresponding commit (default: 1).
+ Full stop, J
If the diff view was opened via the log view, move to the Nth next (older) commit. If the diff was opened via the blame view, @@ -348,7 +358,7 @@ number
Set the number of context lines shown in the diff. By default, 3 lines of context are shown.
-
+
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 @@ -418,6 +428,9 @@
Reload the blame view with the previously blamed commit.
+
+
Open a log view for the currently selected + annotated line.
Prompt for a search pattern and start searching for matching lines. The search pattern is an extended regular expression. Regular @@ -444,7 +457,7 @@ 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.
-
+
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 @@ -512,10 +525,10 @@
Enter the currently selected directory, or switch to the blame view for the currently selected file.
-
+
Open a log view for the currently selected tree entry.
-
+
Open a ref view listing all references in the repository. This can then be used to open a new tree view for arbitrary branches and @@ -548,7 +561,7 @@ 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.
-
+
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 @@ -591,7 +604,7 @@
Open a log view which begins traversing history at the commit resolved via the currently selected reference.
-
+
Open a tree view showing the tree resolved via the currently selected reference.
@@ -621,7 +634,7 @@

The options for tog ref are as follows:

-
+
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 @@ -633,7 +646,7 @@
-

+

Determines the default diff algorithm used by tog. @@ -707,20 +720,20 @@
-

+

The tog utility exits 0 on success, and >0 if an error occurs.

-

+

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

-

+

Christian Weisgerber <naddy@openbsd.org>
@@ -745,12 +758,9 @@ Klemens Nanni <kn@openbsd.org>

-
- - - - - -
July 14, 2022OpenBSD 7.1
+ +
September 7, + 2022 OpenBSD 7.2