commit 51683866037156e78ebc204af63abd4c8e22dd92 from: Stefan Sperling date: Thu Jul 14 11:07:40 2022 UTC sync man pages commit - 4bb2932ea05374e56c42bde11a16f4e7b8124261 commit + 51683866037156e78ebc204af63abd4c8e22dd92 blob - 2b0eece7bd0858ce72e9d8d0330806e97fa1daf8 blob + 6b2c66e07530a7932733f983554356edfe133619 --- git-repository.5.html +++ git-repository.5.html @@ -218,7 +218,7 @@ - +
July 4, 2022July 14, 2022 OpenBSD 7.1
blob - 492fbb5771927f65c53de429ab203f7865a796a3 blob + 54061f0699cf4b3f3c890ea6a4a6578d8ada4b61 --- got-worktree.5.html +++ got-worktree.5.html @@ -189,7 +189,7 @@ - +
July 4, 2022July 14, 2022 OpenBSD 7.1
blob - 06436b9a7b4be95a3b33081c1b725b88ce6501fa blob + 9f9062957516a8748193b5f18c9b5595648c4671 --- got.1.html +++ got.1.html @@ -75,15 +75,6 @@

The commands for got are as follows:

-
- repository-path
-
Create a new empty repository at the specified - repository-path. -

After got init, the - got import command must be used to populate the - empty repository before got checkout can be - used.

-
[-b branch] [-m message] @@ -1913,31 +1904,40 @@ argument. For most commands, the expected argument is a commit ID SHA1 hash. Any remaining text on the line is ignored. Lines which begin with the ‘#’ character are ignored entirely.

-

The available commands are as follows:

+

The available histedit script commands are as follows:

- - + + - - + + - - + + - - + + - - - + + +
pick commit
+ commit Use the specified commit as it is.
edit commit
+ commit Use the specified commit but once changes have been merged into the work tree interrupt the histedit operation for amending.
fold commit
+ commit Combine the specified commit with the next commit listed further below that will be used.
drop commit
+ commit Remove this commit from the edited history.
mesg log-messageUse the specified single-line log message for the commit on the - previous line. If the log message argument is left empty, open an - editor where a new log message can be written.
+ [log-message]Create a new log message for the commit of a preceding + pick or edit command + on the previous line of the histedit script. The optional + log-message argument provides a new single-line + log message to use. If the log-message argument + is omitted, open an editor where a new log message can be + written.

Every commit in the history being edited must be mentioned in @@ -2560,7 +2560,7 @@ populated with files, e.g. from a temporary CVS checkout located at /tmp/src:

-
$ got init +
$ gotadmin init /var/git/src.git
$ got import -r /var/git/src.git -I CVS -I obj /tmp/src
@@ -2808,21 +2808,106 @@ tog(1), git-repository(5), got-worktree(5), - got.conf(5)

+ got.conf(5), + gotweb(8)

-

Stefan Sperling - <stsp@openbsd.org> +

Anthony J. Bentley + <bentley@openbsd.org>
- Martin Pieuchot - <mpi@openbsd.org> + Christian Weisgerber + <naddy@openbsd.org>
+ Hiltjo Posthuma + <hiltjo@codemadness.org> +
+ Josh Rickmar + <jrick@zettaport.com> +
Joshua Stein <jcs@openbsd.org>
+ Klemens Nanni + <kn@openbsd.org> +
+ Martin Pieuchot + <mpi@openbsd.org> +
+ Neels Hofmeyr + <neels@hofmeyr.de> +
+ Omar Polo + <op@openbsd.org> +
Ori Bernstein - <ori@openbsd.org>

+ <ori@openbsd.org> +
+ Sebastien Marie + <semarie@openbsd.org> +
+ Stefan Sperling + <stsp@openbsd.org> +
+ Steven McDonald + <steven@steven-mcdonald.id.au> +
+ Theo Buehler + <tb@openbsd.org> +
+ Thomas Adam + <thomas@xteddy.org> +
+ Tracey Emery + <tracey@traceyemery.net> +
+ Yang Zhong + <yzhong@freebsdfoundation.org>

+

Parts of got, + tog(1), and + gotweb(8) were derived from + code under copyright by:

+

+
+ Caldera International Inc. +
+ Daniel Hartmeier +
+ Esben Norby +
+ Henning Brauer +
+ Håkan Olsson +
+ Ingo Schwarze +
+ Jean-Francois Brousseau +
+ Joris Vink +
+ Jyri J. Virkki +
+ Larry Wall +
+ Markus Friedl +
+ Niall O'Higgins +
+ Niklas Hallqvist +
+ Ray Lai +
+ Ryan McBride +
+ Theo de Raadt +
+ Todd C. Miller +
+ Xavier Santolaria

+

got contains code contributed to the + public domain by +
+ Austin Appleby

@@ -2848,7 +2933,7 @@
- +
July 4, 2022July 14, 2022 OpenBSD 7.1
blob - 1a6bebdde637968f4ec6b80960da7256e891abbf blob + b02502269266bd342d90d94ed629d0b2c1f2f063 --- got.conf.5.html +++ got.conf.5.html @@ -60,6 +60,17 @@ got(1) attempts to reject author information with a missing email address.

+
+ signer-id
+
Configure a signer-id to sign tag objects. This key + will be used to sign all tag objects unless overridden by + got tag -s + 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).

+
path
Configure a path to the "allowed signers" @@ -292,7 +303,7 @@ - +
July 4, 2022July 14, 2022 OpenBSD 7.1
blob - 605dcdfaf2bc57892fe6af5b771a955e59d24ef6 blob + 38061b789ea565df7f11bb3a0d7b0ba4556b510a --- gotadmin.1.html +++ gotadmin.1.html @@ -69,6 +69,15 @@

The commands for gotadmin are as follows:

+
+ repository-path
+
Create a new empty repository at the specified + repository-path. +

After gotadmin init, the + got import command must be used to populate the + empty repository before got checkout can be + used.

+
[-r repository-path]
Display information about a repository. This includes some configuration @@ -282,11 +291,23 @@

-

Stefan Sperling - <stsp@openbsd.org> +

Christian Weisgerber + <naddy@openbsd.org>
+ Josh Rickmar + <jrick@zettaport.com> +
+ Klemens Nanni + <kn@openbsd.org> +
Ori Bernstein - <ori@openbsd.org>

+ <ori@openbsd.org> +
+ Stefan Sperling + <stsp@openbsd.org> +
+ Tracey Emery + <tracey@traceyemery.net>

@@ -319,7 +340,7 @@ - +
July 4, 2022July 14, 2022 OpenBSD 7.1
blob - cf0968fd2cda0c9769a6b0cf39a6d502fcf4c317 blob + f4d494324343ec006be3e28a28938d472990e7ff --- gotweb.8.html +++ gotweb.8.html @@ -145,16 +145,28 @@

-

Tracey Emery - <tracey@traceyemery.net> +

Christian Weisgerber + <naddy@openbsd.org>
+ Jerome Kasper + <neon.king.fr@gmail.com> +
+ Josh Rickmar + <jrick@zettaport.com> +
+ Omar Polo + <op@openbsd.org> +
Stefan Sperling - <stsp@openbsd.org>

+ <stsp@openbsd.org> +
+ Tracey Emery + <tracey@traceyemery.net>

- +
July 4, 2022July 14, 2022 OpenBSD 7.1
blob - 9ec3332566efce459df9b42b66c67b10217fccdf blob + d889515e2af00857e523a67b847195a5d15cfed8 --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -166,7 +166,7 @@ got_logo_url "https://gameoftrees.org" - +
July 4, 2022July 14, 2022 OpenBSD 7.1
blob - 5f552e61f99ceaacddcf18dd7282825b659e8e1d blob + 8d96cac194d2dacbbb37d0c6b90ee050a203ed3f --- tog.1.html +++ tog.1.html @@ -84,7 +84,8 @@ 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:

+ Backspace.

+

The global key bindings are:

Quit tog.
@@ -94,8 +95,19 @@
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.
+ tog will automatically use vertical split-screen + views if the size of the terminal window is sufficiently large.
+
+
Switch the current split-screen layout, and render all active views in + this new layout. The split-screen layout can be either vertical or + horizontal. If the terminal is not wide enough when switching to a + vertical split, views will render in fullscreen.
+
-
+
When in a split-screen view, decrease the size of the focussed split N + increments (default: 1).
+
+
When in a split-screen view, increase the size of the focussed split N + increments (default: 1).

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

@@ -298,12 +310,16 @@ Comma
If the diff view was opened via the log view, move to the Nth previous (younger) - commit (default: 1).
+ commit. If the diff was opened via the blame + view, move to the Nth previous line and load the corresponding commit + (default: 1).
If the diff view was opened via the - log view, move to the Nth next (older) commit - (default: 1).
+ log view, move to the Nth next (older) commit. + If the diff was opened via the blame view, + move to the Nth next line and load the corresponding commit (default: + 1).
Prompt for a search pattern and start searching for matching lines. The search pattern is an extended regular expression. Regular @@ -626,10 +642,11 @@ “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.
+
Determines the default layout of split-screen views. If set to + “h” or “H”, tog will + use horizontal split by default. Otherwise, vertical split will be used. + The S key can be used to switch between vertical + and horizontal split layout at run-time.
tog shows colorized output if this variable is set to a non-empty value. The default color scheme can be modified by setting @@ -704,16 +721,34 @@

-

Stefan Sperling - <stsp@openbsd.org> +

Christian Weisgerber + <naddy@openbsd.org>
+ Josh Rickmar + <jrick@zettaport.com> +
Joshua Stein - <jcs@openbsd.org>

+ <jcs@openbsd.org> +
+ Mark Jamsek + <mark@jamsek.dev> +
+ Martin Pieuchot + <mpi@openbsd.org> +
+ Omar Polo + <op@openbsd.org> +
+ Stefan Sperling + <stsp@openbsd.org> +
+ Klemens Nanni + <kn@openbsd.org>

- +
July 4, 2022July 14, 2022 OpenBSD 7.1