commit 7985a487e374c497dcec452960284d5d0347d9b6 from: Stefan Sperling date: Mon Jan 30 09:19:56 2023 UTC sync man pages commit - a4e48310aa18be470d3b0ceee743fff4365dabe5 commit + 7985a487e374c497dcec452960284d5d0347d9b6 blob - 2071f461886847700f08e45a07fa4d316ac1a2fb blob + 5cc83c6ae12571a41866f719f2bcc779056930e0 --- git-repository.5.html +++ git-repository.5.html @@ -214,7 +214,7 @@
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - dd887fb29c98441735f7b976f9525436b1fd60be blob + 49d2a61c4646ba93878ace3fa6dea35ed02987e0 --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - 180f3808ba8401d4d361275429aa10a842cf8a75 blob + 34de6ab96ea0f3f69b3ecc4bbc9d6a651ae36e3c --- got.1.html +++ got.1.html @@ -1630,7 +1630,7 @@
- commit
+ [-lX] [commit]
(alias: cy)
@@ -1678,16 +1678,55 @@

The merged changes will appear as local changes in the work tree, which may be viewed with got diff, amended manually or with further got cherrypick - commands, committed with got commit, or - discarded again with got revert.

+ commands, committed with got commit.

+

If invoked in a work tree where no + rebase, histedit, or + merge operation is taking place, + got cherrypick creates a record of commits which + have been merged into the work tree. When a file changed by + got cherrypick is committed with + got commit, the log messages of relevant merged + commits will then appear in the editor, where the messages must be + further adjusted to convey the reasons for cherrypicking the changes. If + all the changes in all files touched by a given commit are discarded, + e.g. with got revert, this commit's log message + record will also disappear.

got cherrypick will refuse to run if certain preconditions are not met. If the work tree contains multiple base commits, it must first be updated to a single base commit with got update. If any relevant files already contain merge conflicts, these conflicts must be resolved first.

+

The options for got + cherrypick are as follows:

+
+
+
Display a list of commit log messages recorded by cherrypick + operations, represented by references in the + “refs/got/worktree” reference namespace. If a + commit is specified, only show the log message + of the specified commit. +

If invoked in a work tree, only log messages recorded by + cherrypick operations in the current work tree will be displayed. + Otherwise, all commit log messages will be displayed irrespective of + the work tree in which they were created. This option cannot be used + with -X.

+
+
+
Delete log messages created by previous cherrypick operations, + represented by references in the “refs/got/worktree” + reference namespace. If a commit is specified, + only delete the log message of the specified commit. +

If invoked in a work tree, only log messages recorded by + cherrypick operations in the current work tree will be deleted. + Otherwise, all commit log messages will be deleted irrespective of + the work tree in which they were created. This option cannot be used + with -l.

+
+
+

- commit
+ [-lX] [commit]
(alias: bo)
@@ -1736,13 +1775,51 @@

The reverse-merged changes will appear as local changes in the work tree, which may be viewed with got diff, amended manually or with further got backout - commands, committed with got commit, or - discarded again with got revert.

+ commands, committed with got commit.

+

If invoked in a work tree where no + rebase, histedit, or + merge operation is taking place, + got backout creates a record of commits which + have been reverse-merged into the work tree. When a file changed by + got backout is committed with + got commit, the log messages of relevant + reverse-merged commits will then appear in the editor, where the + messages must be further adjusted to convey the reasons for backing out + the changes. If all the changes in all files touched by a given commit + are discarded, e.g. with got revert, this + commit's log message record will also disappear.

got backout will refuse to run if certain preconditions are not met. If the work tree contains multiple base commits, it must first be updated to a single base commit with got update. If any relevant files already contain merge conflicts, these conflicts must be resolved first.

+

The options for got + backout are as follows:

+
+
+
Display a list of commit log messages recorded by backout operations, + represented by references in the “refs/got/worktree” + reference namespace. If a commit is specified, + only show the log message of the specified commit. +

If invoked in a work tree, only log messages recorded by + backout operations in the current work tree will be displayed. + Otherwise, all commit log messages will be displayed irrespective of + the work tree in which they were created. This option cannot be used + with -X.

+
+
+
Delete log messages created by previous backout operations, + represented by references in the “refs/got/worktree” + reference namespace. If a commit is specified, + only delete the log message of the specified commit. +

If invoked in a work tree, only log messages recorded by + backout operations in the current work tree will be deleted. + Otherwise, all commit log messages will be deleted irrespective of + the work tree in which they were created. This option cannot be used + with -l.

+
+
+

[-aclX] [branch]
@@ -1870,7 +1947,7 @@
Continue an interrupted rebase operation. If this option is used, no other command-line arguments are allowed.
-
+
Show a list of past rebase operations, represented by references in the “refs/got/backup/rebase” reference namespace.

Display the author, date, and log message of each backed @@ -1889,7 +1966,7 @@ does not require a work tree. None of the other options can be used together with -l.

-
+
Delete backups created by past rebase operations, represented by references in the “refs/got/backup/rebase” reference namespace. @@ -2093,7 +2170,7 @@ 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.
-
+
Show a list of past histedit operations, represented by references in the “refs/got/backup/histedit” reference namespace.

Display the author, date, and log message of each backed @@ -2118,7 +2195,7 @@ 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 namespace. @@ -2356,7 +2433,7 @@ “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 paths were provided on the command line, show the staged paths among @@ -3052,7 +3129,7 @@ remote "origin" {
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - c9a30bb4674471bf7e78ed2d8c721d37607281e2 blob + ffd6008f70819ad7ea1c246f69109d1176bc6092 --- got.conf.5.html +++ got.conf.5.html @@ -306,7 +306,7 @@
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - e036fa7866a0e2bb20f087d233b69098958d7ed5 blob + dc24400ff5e921ed1e2d319bf3e6809f32ba6506 --- gotadmin.1.html +++ gotadmin.1.html @@ -344,7 +344,7 @@
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - ac69e67ee7435c42897371df18b25029d6c420dd blob + 78495330bf7b43ea403d49791a9d5c506f485e0e --- gotctl.8.html +++ gotctl.8.html @@ -86,7 +86,7 @@
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - 0c70de054cf9609a39d7cb8208920ee2156f422c blob + bede3890b9c5ad4d8793b159d3481f6fcaf7bfcf --- gotd.8.html +++ gotd.8.html @@ -99,7 +99,7 @@
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - d8a333276e930754a3636c381eb35d2e37ea2ad1 blob + 6bbe55015fff76f658831e60552be68b6d813b68 --- gotd.conf.5.html +++ gotd.conf.5.html @@ -210,7 +210,7 @@ connection {
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - 97bf5f602022a41ca7a20386d3aef7609ef201e6 blob + 9e12b8ee72caf39e2a11242ed0ad0c86f767ec82 --- gotsh.1.html +++ gotsh.1.html @@ -100,7 +100,7 @@ protect the server machine and any systems reachable from it, especially if anonymous users are allowed to connect:

-
Match User anonymous
+
Match User developer
     DisableForwarding yes
     PermitTTY no
@@ -112,6 +112,31 @@ DisableForwarding yes PermitTTY no +

Anonymous users can be given public read-only access by using a + gotd.conf(5) access rule + such as the following:

+
+
repository "public" {
+	path "/var/git/public.git"
+	permit ro anonymous
+}
+
+

The anonymous user account should have a publicly known password, + or can be set up with an empty password in which case the user's + vipw(8) entry would look + similar to this example:

+
+
anonymous::1002:1002::0:0:Anonymous:/home/anonymous:/usr/local/bin/gotsh
+
+

Use of an empty password must be explicitly allowed in + sshd_config(5):

+
+
Match User anonymous
+    PasswordAuthentication yes
+    PermitEmptyPasswords yes
+    DisableForwarding yes
+    PermitTTY no
+

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

@@ -185,7 +185,7 @@
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - ce4c2ba9bc27449070928e306dc600b62edd9bf3 blob + 5e8f92306d2e6814cc106f27605b154fbcf18aeb --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -253,7 +253,7 @@ server "localhost-unix" {
January 23, + line">January 30, 2023 OpenBSD 7.2
blob - c850eb231deac8f42e22ad18d28ace39b3ef3189 blob + f883bbb469fdd54993e2d1fb01485fcef20977e0 --- tog.1.html +++ tog.1.html @@ -797,7 +797,7 @@
January 23, + line">January 30, 2023 OpenBSD 7.2