commit dfc34448445f311e65bbacebf55a6fedb862a400 from: Stefan Sperling date: Mon May 06 11:49:25 2024 UTC sync man pages commit - 1044972a376a2822efa4791dbd55a597c68c217c commit + dfc34448445f311e65bbacebf55a6fedb862a400 blob - 748836b22229c138b54386f342915d2fbbf72a9c blob + 7976c47b337591a6528f7c5612d4cf8713310d00 --- git-repository.5.html +++ git-repository.5.html @@ -214,7 +214,7 @@
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 82452f07891253bdba9953ee86ec1838003d2cdb blob + 15d5badc1b031fcc097dfc1fc0713442e6f3b570 --- gitwrapper.1.html +++ gitwrapper.1.html @@ -142,7 +142,7 @@
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 9f112b2eef1ea7fb9612b912eb4072238b3c3435 blob + c7720b248733e2cc40b2dfb58b34f75185aecc65 --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 1f30ef1e080b44cab9ef78f963a4c616df9a6f75 blob + d4ce07d75dc6d88f2b3be20e83044d8592325557 --- got.1.html +++ got.1.html @@ -161,8 +161,8 @@

The “smart” Git HTTP protocol is supported by got clone and got fetch, but not by got send. Sending - from a repository cloned over HTTP will require use of the - send directive in + from a repository cloned over HTTP will require use of a + send block in got.conf(5) to ensure that the “ssh://” protocol will be used by got send.

@@ -2722,7 +2722,7 @@
- [-lpRS] [-F + [-lpS] [-F response-script] [path ...]
(alias: @@ -2786,10 +2786,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.
-
-
Permit recursion into directories. If this option is not specified, - got stage will refuse to run if a specified - path is a directory.
Allow staging of symbolic links which point outside of the path space that is under version control. By default, got @@ -2818,7 +2814,7 @@ necessary.

- [-pR] [-F + [-p] [-F response-script] [path ...]
(alias: @@ -2872,10 +2868,6 @@ 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.
-
-
Permit recursion into directories. If this option is not specified, - got unstage will refuse to run if a specified - path is a directory.
@@ -3132,6 +3124,15 @@ sys/uvm/uvm_ubc.c
$ got remove sys/uvm/uvm_vnode.c
+

A file can be renamed or moved by removing it from its old + location and adding it at the new location:

+

+
$ cp oldfile.c newfile.c
+
$ got remove oldfile.c
+
$ got add newfile.c
+

got does not yet follow file history + across renames, but git(1) + will be able to do so regardless.

Create a new commit from local changes in a work tree directory with a pre-defined log message.

@@ -3508,7 +3509,7 @@ remote "origin" {
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 1917a233a6eb9eee6d95a52e39bfc9f9c1e693e3 blob + cb3bbe9a76b1b1a2a3847ef121bb202dafd63746 --- got.conf.5.html +++ got.conf.5.html @@ -125,14 +125,28 @@ git-daemon(1) server. Use of this protocol is discouraged since it supports neither authentication nor encryption. -
git+ssh
+
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
-
Short alias for git+ssh.
+
http
+
The “smart” Git HTTP protocol. Not compatible with + servers using the “dumb” Git HTTP protocol. +

The “smart” Git HTTP protocol is + supported by got clone and + got fetch, but not by + got send. To send from a repository + cloned over HTTP, add a send block (see + below) to ensure that the “ssh://” protocol will + be used by got send.

+

Use of this protocol is discouraged since it supports + neither authentication nor encryption.

+
+
https
+
The “smart” Git HTTP protocol wrapped in + SSL/TLS.
@@ -257,8 +271,8 @@ repository:

remote "origin" {
-	server git.gameoftrees.org
-	protocol git
+	server anonymous@got.gameoftrees.org
+	protocol ssh
 	repository got
 	branch { "main" }
 }
@@ -306,7 +320,7 @@
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 3908702f5fa21b3db0aaa5e2411ce87751245062 blob + b42ff8aa59d400d3502ad9433b7263890ec0c355 --- gotadmin.1.html +++ gotadmin.1.html @@ -424,7 +424,7 @@
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - dd544668c4959201fb0376ff2340a043b005e0d9 blob + a7a957740ed2061bc8972effde4a42d20021334a --- gotctl.8.html +++ gotctl.8.html @@ -86,7 +86,7 @@
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 934c1d4fe17f4b57a6e53a0d6b195b06cb45a367 blob + 23055ac120108fd294c7f3473d3c71683ec3c1ec --- gotd.8.html +++ gotd.8.html @@ -99,7 +99,7 @@
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 10d040b23b01c6dd5e2dbd9b635a4689c9b3f97a blob + 5c46d031257966a5ab587692aa730a16f71dc2f9 --- gotd.conf.5.html +++ gotd.conf.5.html @@ -291,10 +291,21 @@ credentials.

The request body contains a JSON object with a “notifications” property containing an array of - notification objects. Each notification object has a - ‘type’ property. Depending on the type, each - notification object has different fields. The types are:

+ notification objects. The following notification object properties + are always present:

+
+
The repository name as a string.
+
+
The committer's user account as authenticated by + gotd(8) as a + string.
+
+
The notification object type as a string.
+
+

Each notification object carries additional type-specific + properties. The types and their type-specific properties are:

+
The commit notification object has the following fields. Except where noted, all are optional. @@ -304,8 +315,6 @@ When several commits are batched in a single send operation, not all of the fields are available for each commit object.
-
-
The repository name as string.
The commit ID as string, may be abbreviated.
@@ -326,7 +335,7 @@
An object with the author information. Has the same fields as - the committer but may be unset.
+ the ‘committer’ but may be unset.
Number, representing the number of seconds since the Epoch in UTC.
@@ -337,10 +346,10 @@
The complete commit message, may be unset.
An object with the summarized changes, may be unset. Contains - a files field with an array of objects - describing the changes per-file and a - total field with the cumulative - changes. The changes per-file contains the following fields: + a ‘files’ field with an array of objects + describing the changes per-file and a ‘total’ + field with the cumulative changes. The changes per-file + contains the following fields:

@@ -355,19 +364,17 @@
The number of lines removed.
-

The total object contains - two fields: added and - removed which are the number of - added and removed lines respectively.

+

The ‘total’ object contains two + fields: ‘added’ and ‘removed’ + which are the number of added and removed lines + respectively.

The branch deleted notifications has the following fields, all guaranteed to be set: -
-
-
The repository name as string.
+
The removed branch reference.
@@ -378,23 +385,19 @@
The tag notification has the following fields, all guaranteed to be set:
-
repo
-
The repository name as string.
tag
The tag reference.
tagger
The user information, with the same format of the - committer field for the - commit notification but with all the - field guaranteed to be set.
+ ‘committer’ field for the ‘commit’ + notification but with all the field guaranteed to be set.
Number, representing the number of seconds since the Epoch in UTC.
The object being tagged. It contains the fields - type with the object type and - id with the object id being - tagged.
+ ‘type’ with the object type and + ‘id’ with the object id being tagged.
The tag message.
@@ -471,7 +474,7 @@ connection {
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 2f8b5bbb49b15a58dc48a06aeea02fd1de696423 blob + cc433ea0aa641f9a2aa00e604cee893480d558d7 --- gotsh.1.html +++ gotsh.1.html @@ -157,7 +157,7 @@
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 1b034f69fee6aabb1422cfab705d85302fdfd278 blob + 67e752267bdc6f69fa849f36c9a863d258f230c2 --- gotwebd.8.html +++ gotwebd.8.html @@ -188,7 +188,7 @@ server "example.com" {
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - bf258f30500ae7840e0c6f063860270ffda2ef16 blob + df1924790c646b4691bc170c03bf5e2680d62447 --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -236,7 +236,7 @@ owner = "Your Name"
April 23, + line">May 6, 2024 OpenBSD 7.5
blob - 91892d4bca9fd1e8c531c15615c5dddbea0b5a34 blob + 7a12c169c9a8f169919305485dcdf488e9b240fc --- tog.1.html +++ tog.1.html @@ -847,7 +847,7 @@
April 23, + line">May 6, 2024 OpenBSD 7.5