commit fd9580e1478440cb410206c1c6bddf62a607304a from: Stefan Sperling date: Thu Nov 03 14:09:01 2022 UTC sync man pages commit - 5f1f4c503f6aab99064411174b51568eadd094a6 commit + fd9580e1478440cb410206c1c6bddf62a607304a blob - d91ebfd5bd4d5d4512a9eff154b04bd2584fc316 blob + 0163ec04103035d14e51df33aaeda7d288494e73 --- git-repository.5.html +++ git-repository.5.html @@ -214,7 +214,7 @@
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - a81a11860d20a76ada8040cf8dcad11edc0e63e5 blob + 2f7b8f01e6c25906f97d99ff83fdeeee39289638 --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - a45272356912027e21c5c7eee7a6b27c1f6a39a0 blob + 28b3606a7f83f4bc190d5d81efe7dd0e92cd9f22 --- got.1.html +++ got.1.html @@ -1380,7 +1380,7 @@
- [-NS] [-A + [-NnS] [-A author] [-F path] [-m message] [path ...]
@@ -1467,6 +1467,10 @@ the commit message in an editor. It has no effect unless it is used together with the -F option and is intended for non-interactive use such as scripting. +
+
This option prevents got commit from + generating a diff of the to-be-committed changes in a temporary file + which can be viewed while editing a commit message.
Allow the addition of symbolic links which point outside of the path space that is under version control. By default, got @@ -2281,7 +2285,7 @@
Continue an interrupted merge operation. If this option is used, no other command-line arguments are allowed.
-
+
Merge changes into the work tree as usual but do not create a merge commit immediately. The merge result can be adjusted as desired before a merge commit is created with got merge -c. @@ -3034,7 +3038,7 @@ remote "origin" {
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - fda77f6007360b525e2f6df0cf30c2d7160aa66b blob + 8a681808b068d303ec301874abafd7a5dd27c58b --- got.conf.5.html +++ got.conf.5.html @@ -96,7 +96,14 @@
Define a remote repository. The specified name can be used to refer to the remote repository on the command line of got fetch and got send. -

Information about this repository is declared in a block of +

When repositories are shared between multiple users on the + system, it is recommended that users configure their trusted remote + repositories in each of their work-trees' + got.conf files, overriding corresponding + repository-wide settings. This can avoid potentially undesirable + connections to remote repositories placed into the shared repository's + got.conf file by other users.

+

Information about a repository is declared in a block of options enclosed in curly brackets:

@@ -299,7 +306,7 @@
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - ddd223dd8504bc6e9889ad018bc138c27458063d blob + c91e910b619a8b5234c31aba65bdd8af29923230 --- gotadmin.1.html +++ gotadmin.1.html @@ -344,7 +344,7 @@
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - c3382c4d18318d9d11c431d7659dc27c45cc9c36 blob + 3e06ab3f134ca9f84505c801da698e2161801931 --- gotd.8.html +++ gotd.8.html @@ -93,7 +93,7 @@
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - /dev/null blob + 788fa54abffc7034ca759aaf4044d053585cf55b (mode 644) --- /dev/null +++ gotctl.8.html @@ -0,0 +1,91 @@ + + + + + + + GOTCTL(8) + + + +
GOTCTL(8) System + Manager's Manual GOTCTL(8)
+
+
+

+

gotctl — + control the Game of Trees + Daemon

+
+
+

+ + + + + +
gotctl[-hV] [-f + path] command + [arg ...]
+
+
+

+

gotctl controls the + gotd(8) daemon.

+

The options for gotctl are as follows:

+
+
+
Display usage information and exit immediately.
+
+ path
+
Set the path to the unix socket which + gotd(8) is listening on. If + not specified, the default path /var/run/gotd.sock + will be used.
+
, + --version
+
Display program version and exit immediately.
+
+

The commands for gotctl are as + follows:

+
+
+
Display information about a running gotd(8) instance.
+
+
Stop a running gotd(8) + instance. This operation requires root privileges.
+
+
+
+

+

got(1), + gotd(8)

+
+
+

+

Stefan Sperling + <stsp@openbsd.org>

+
+
+
November 3, + 2022 OpenBSD 7.2
+ + blob - 1775937c2e358e0212f7599cfacaa3cd85d6ec81 blob + 36f5a092f5294143a37e54b3f11ced30eac23523 --- gotd.conf.5.html +++ gotd.conf.5.html @@ -133,7 +133,7 @@ repository "openbsd/ports" {
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - ba586387eb579ae90f9dbb5b2cd4b021637be008 blob + 48a1fe2bcf46503e718b89e1bd5cc6e46679e84f --- gotsh.1.html +++ gotsh.1.html @@ -85,7 +85,8 @@ gotsh.

It is recommended to restrict ssh(1) features available to users of - gotsh. See the EXAMPLES section for details.

+ gotsh. See the + EXAMPLES section for details.

@@ -106,7 +107,7 @@ gotd(8) unix socket.

Match Group _gotsh
-    DisableForwarding
+    DisableForwarding yes
     PermitTTY no
@@ -126,7 +127,7 @@
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - e7a676923f54c35afd7a8a1ad2cda8d0a3494e08 blob + b2cde30ec3d3f948222712451aa26bcb13a287ab --- gotweb.8.html +++ gotweb.8.html @@ -162,7 +162,7 @@
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - 9088a211458d7c10b9789a65e03cc905f7be42d5 blob + 3a911cf559d65956d50771e4819117f4a72dc998 --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -162,7 +162,7 @@ got_logo_url "https://gameoftrees.org"
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - b02453e2be7a8d1dc07915ad866df0c602a27b6e blob + e30470f4a015111ebdcbea8b5bce871bbfb79a8f --- gotwebd.8.html +++ gotwebd.8.html @@ -30,7 +30,7 @@

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

@@ -46,7 +46,7 @@

-

gotwebd is a Fast-CGI server program which +

gotwebd is a FastCGI 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.

@@ -75,7 +75,7 @@
  1. The httpd.conf(5) configuration file must be adjusted to run gotwebd - as a Fast-CGI helper program. The + as a FastCGI helper program. The EXAMPLES section below contains an appropriate configuration file sample.
  2. httpd(8) must be enabled and started: @@ -185,7 +185,7 @@
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - 5a85f237e22a950d53fdc16320278fc6775a11ff blob + d02690301664b35045960103c16cd74e95564c4b --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -138,6 +138,10 @@ listen on $lan_addr path
Set the path to the directory which contains Git repositories that the server should publish.
+
+ on | off
+
Set whether to display the repository only if it contains the magic + git-daemon-export-ok file.
on | off
Toggle display of last repository modification date.
@@ -213,6 +217,8 @@ server "localhost-unix" { #show_repo_age false #show_repo_description no #show_repo_cloneurl off + # off by default + #respect_exportok on #max_repos 100 #max_repos_display 25 @@ -247,7 +253,7 @@ server "localhost-unix" {
October 24, + line">November 3, 2022 OpenBSD 7.2
blob - 7f5b34cf46ad38fd690c1b92b266d5af1e4c38a9 blob + e09c759fe1d571882701e1b78dac2cf113420cc9 --- sync-man.sh +++ sync-man.sh @@ -17,6 +17,7 @@ for f in gotd.8 gotd.conf.5; do $CONVERT $HOME/src/got/gotd/$f > ./${f}.html done $CONVERT $HOME/src/got/gotsh/gotsh.1 > ./gotsh.1.html +$CONVERT $HOME/src/got/gotctl/gotctl.8 > ./gotctl.8.html got st blob - a9ed065f02ed269b35e40055c49cc8dcaa496c83 blob + 82fe9cf7d8fb6624abd6b3b7ca8328293ba06cef --- tog.1.html +++ tog.1.html @@ -778,7 +778,7 @@
October 24, + line">November 3, 2022 OpenBSD 7.2