commit f6a6fa94328d407ca827c52bdbd52faf81520cec from: Stefan Sperling date: Wed Feb 22 22:29:52 2023 UTC sync man pages commit - 19898622e17988154d9131968e9a2a8d039e5610 commit + f6a6fa94328d407ca827c52bdbd52faf81520cec blob - 5cc83c6ae12571a41866f719f2bcc779056930e0 blob + 640327e8962a1f692f194a6ea067173e85cb9df8 --- git-repository.5.html +++ git-repository.5.html @@ -214,7 +214,7 @@

January 30, + line">February 22, 2023 OpenBSD 7.2

blob - 49d2a61c4646ba93878ace3fa6dea35ed02987e0 blob + 46fa54b327aae922b11dc47db9a32640e51bcfbb --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@

January 30, + line">February 22, 2023 OpenBSD 7.2

blob - 34de6ab96ea0f3f69b3ecc4bbc9d6a651ae36e3c blob + 81e7d513182bb0cd08c1318bd9481e601c1bc28b --- got.1.html +++ got.1.html @@ -108,7 +108,9 @@ 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). + glob(7). Ignore + patterns which end with a slash, “/”, will only match + directories.

-m message

Use the specified log message when creating the new commit. Without @@ -265,6 +267,20 @@ got.conf(5) or Git's config file of the local repository, as created by got clone. +

By default, any branches configured in + got.conf(5) for the + remote-repository will be fetched. If + got fetch is invoked in a work tree then this + work tree's current branch will be fetched, too, provided it is present + on the server. If no branches to fetch can be found in + got.conf(5) or via a + work tree, or said branches are not found on the server, a branch + resolved via the remote repository's HEAD reference will be fetched. + Likewise, if a HEAD reference for the + remote-repository exists but its target no longer + matches the remote HEAD, then the new target branch will be fetched. + This default behaviour can be overridden with the + -a and -b options.

New changes will be stored in a separate pack file downloaded from the server. Optionally, separate pack files stored in the repository can be combined with got.conf(5). If - this option is not specified, a branch resolved via the remote - repository's HEAD reference will be fetched. Cannot be used together - with the -b option.

+ got.conf(5). Cannot + be used together with the -b option.

-b branch

Fetch the specified branch from the remote repository's “refs/heads/” reference namespace. This option may be specified multiple times to build a list of branches to - fetch. If this option is not specified, a branch resolved via the - remote repository's HEAD reference will be fetched. Cannot be used - together with the -a option.

+ fetch. Cannot be used together with the -a + option.

-d

Delete branches and tags from the local repository which are no longer present in the remote repository. Only references are deleted. Any @@ -653,16 +666,18 @@ got status reads glob(7) patterns from .cvsignore and .gitignore files in each traversed directory - and will not display unversioned files which match these patterns. As an - extension to glob(7) - matching rules, got status supports consecutive - asterisks, “**”, which will match an arbitrary amount of - directories. Unlike cvs(1), got status only supports a single - ignore pattern per line. Unlike git(1), got status does not support - negated ignore patterns prefixed with “!”, and gives no - special significance to the location of path component separators, + and will not display unversioned files which match these patterns. + Ignore patterns which end with a slash, “/”, will only + match directories. As an extension to glob(7) matching rules,

got
+        status

supports consecutive asterisks, “**”, which + will match an arbitrary amount of directories. Unlike + cvs(1), + got status only supports a single ignore pattern + per line. Unlike git(1), + got status does not support negated ignore + patterns prefixed with “!”, and gives no special + significance to the location of path component separators, “/”, in a pattern.

log @@ -1388,7 +1403,7 @@

commit - [-NnS] [-A + [-CNnS] [-A author] [-F path] [-m message] [path ...]

@@ -1448,9 +1463,9 @@ 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. + on behalf of 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 @@ -1458,6 +1473,14 @@ got.conf(5), or Git configuration settings.

-C

Allow committing files in conflicted status. +

Committing files with conflict markers should generally be + avoided. Cases where conflict markers must be stored in the + repository for some legitimate reason should be very rare. There are + usually ways to avoid storing conflict markers verbatim by applying + appropriate programming tricks.

-F path

Use the prepared log message stored in the file found at @@ -1686,11 +1709,15 @@ 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.

+ commits will then appear in the editor, where the messages should be + further adjusted to convey the reasons for cherrypicking the changes. + Upon exiting the editor, if the time stamp of the log message file is + unchanged or the log message is empty,

got
+        commit

will fail with an unmodified or empty log message + error.

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 @@ -1784,10 +1811,14 @@ 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.

+ messages should be further adjusted to convey the reasons for backing + out the changes. Upon exiting the editor, if the time stamp of the log + message file is unchanged or the log message is empty, + got commit will fail with an unmodified or empty + log message error.

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 @@ -1822,7 +1853,7 @@

rebase - [-aclX] [branch]

+ [-aCclX] [branch]

(alias:
       rb)

@@ -1944,6 +1975,10 @@

-a

Abort an interrupted rebase operation. If this option is used, no other command-line arguments are allowed.

-C

Allow a rebase operation to continue with files in conflicted status. + This option should generally be avoided, and can only be used with the + -c option.

-c

Continue an interrupted rebase operation. If this option is used, no other command-line arguments are allowed.

@@ -1985,7 +2020,7 @@

histedit - [-aceflmX] [-F + [-aCcdeflmX] [-F histedit-script] [branch]

(alias:
@@ -2149,9 +2184,18 @@

-a


       Abort an interrupted histedit operation. If this option is used, no
           other command-line arguments are allowed.
+      -C
+      Allow a histedit operation to continue with files in conflicted
+          status. This option should generally be avoided, and can only be used
+          with the -c option.
       -c
       Continue an interrupted histedit operation. If this option is used, no
           other command-line arguments are allowed.
+      -d
+      Drop all commits. This option is a quick equivalent to a histedit
+          script which drops all commits. The -d option
+          can only be used when starting a new histedit operation. If this
+          option is used, no other command-line arguments are allowed.
       -e
       Interrupt the histedit operation for editing after merging each
           commit. This option is a quick equivalent to a histedit script which
@@ -2267,7 +2311,7 @@
         reverted with got revert.
   
   merge
-    [-acn] [branch]
+    [-aCcn] [branch]
   
     (alias:
       mg)
@@ -2370,6 +2414,10 @@
       
-a
       Abort an interrupted merge operation. If this option is used, no other
           command-line arguments are allowed.
+      -C
+      Allow a merge operation to continue with files in conflicted status.
+          This option should generally be avoided, and can only be used with the
+          -c option.
       -c
       Continue an interrupted merge operation. If this option is used, no
           other command-line arguments are allowed.
@@ -3129,7 +3177,7 @@ remote "origin" {
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2
 
 
blob - ffd6008f70819ad7ea1c246f69109d1176bc6092
blob + 8a488b05f6db07bde29719ef01c56e2b4b354a0b
--- got.conf.5.html
+++ got.conf.5.html
@@ -306,7 +306,7 @@
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2
 
 
blob - dc24400ff5e921ed1e2d319bf3e6809f32ba6506
blob + fa40177ea1446e8d5d2ebb933184ba3e46a8a124
--- gotadmin.1.html
+++ gotadmin.1.html
@@ -106,7 +106,7 @@
     
   
   pack
-    [-aq] [-r
+    [-aDq] [-r
     repository-path] [-x
     reference] [reference ...]
   Generate a new pack file and a corresponding pack file index. By default,
@@ -128,6 +128,10 @@
       
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.
+      -D
+      Force the use of ref-delta representation for deltified objects. If
+          this option is not specified, offset-deltas will be used to represent
+          deltified objects.
       -q
       Suppress progress reporting output.
       -r
@@ -344,7 +348,7 @@
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2
 
 
blob - 78495330bf7b43ea403d49791a9d5c506f485e0e
blob + 8c10bb407dd68cc27348b96df3ba8a2b5e2e4a18
--- gotctl.8.html
+++ gotctl.8.html
@@ -86,7 +86,7 @@
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2
 
 
blob - bede3890b9c5ad4d8793b159d3481f6fcaf7bfcf
blob + c62308ff458c495109093148bb88cb89d8922bbc
--- gotd.8.html
+++ gotd.8.html
@@ -99,7 +99,7 @@
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2
 
 
blob - 6bbe55015fff76f658831e60552be68b6d813b68
blob + 1a1dc512af9a0c947a16dbed02212ef865c08b0a
--- gotd.conf.5.html
+++ gotd.conf.5.html
@@ -210,7 +210,7 @@ connection {
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2
 
 
blob - 9e12b8ee72caf39e2a11242ed0ad0c86f767ec82
blob + 24fca51cbd0740bf8be81e846d23008b41f07c7b
--- gotsh.1.html
+++ gotsh.1.html
@@ -154,7 +154,7 @@
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2
 
 
blob - fddfb5664ba51a629e3b28d5552540538c8016c4
blob + adbe9fd5e421d817bb8a4b5fd737fd68e769263f
--- gotwebd.8.html
+++ gotwebd.8.html
@@ -185,7 +185,7 @@
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2
 
 
blob - 5e8f92306d2e6814cc106f27605b154fbcf18aeb
blob + 9dfb77ada555b6385766a0ef1c7a754ee9372ef1
--- gotwebd.conf.5.html
+++ gotwebd.conf.5.html
@@ -206,7 +206,7 @@ owner = "Your Name"
 # all paths relative to /var/www (httpd chroot jail)
 #
 
-prefork 1
+prefork 3
 
 server "localhost-unix" {
 	repos_path "/got/public"
@@ -220,17 +220,16 @@ server "localhost-unix" {
 	logo_url   "https://gameoftrees.org"
 
 	# on by default
-	#show_site_owner  off
-	#show_repo_owner  off
-	#show_repo_age  false
+	#show_site_owner  on
+	#show_repo_owner  on
+	#show_repo_age  on
 	#show_repo_description no
-	#show_repo_cloneurl  off
-	# off by default
-	#respect_exportok  on
+	#show_repo_cloneurl  on
+	#respect_exportok off
 
-	#max_repos   100
+	#max_repos   0
 	#max_repos_display  25
-	#max_commits_display  50
+	#max_commits_display  25
 }
 
 # Example server context for FCGI over TCP connections:
@@ -253,7 +252,7 @@ server "localhost-unix" {
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2
 
 
blob - f883bbb469fdd54993e2d1fb01485fcef20977e0
blob + afec55464ebcaa00a7dac4aa3b73d6fd10515150
--- tog.1.html
+++ tog.1.html
@@ -122,6 +122,20 @@
   
Go to line N in the view (default: last line).
   g
   Go to line N in the view (default: first line).
+  Right-arrow,
+    l
+  Scroll view to the right N increments (default: 1).
+    

+    Output moves left on the screen.
+  Left-arrow,
+    h
+  Scroll view to the left N increments (default: 1).
+    

+    Output moves right on the screen.
+  $
+  Scroll view to the rightmost position.
+  0
+  Scroll view left to the start of the line.
 
 The commands for tog are as follows:
 
@@ -146,20 +160,6 @@
       Up-arrow,
         k, <, Comma, Ctrl-p
       Move the selection cursor up N lines (default: 1).
-      Right-arrow,
-        l
-      Scroll log message field to the right N increments (default: 1).
-        

-        Log message moves left on the screen.
-      Left-arrow,
-        h
-      Scroll log message field to the left N increments (default: 1).
-        

-        Log message moves right on the screen.
-      $
-      Scroll log message field to the rightmost position.
-      0
-      Scroll log message field to the leftmost position.
       Page-down,
         Space, Ctrl+f, f
       Move the selection cursor down N pages (default: 1).
@@ -294,20 +294,6 @@
       Up-arrow,
         k, Ctrl-p
       Scroll up N lines (default: 1).
-      Right-arrow,
-        l
-      Scroll view to the right N increments (default: 1).
-        

-        Diff output moves left on the screen.
-      Left-arrow,
-        h
-      Scroll view to the left N increments (default: 1).
-        

-        Diff output moves right on the screen.
-      $
-      Scroll view to the rightmost position.
-      0
-      Scroll view left to the start of the line.
       Page-down,
         Space, Ctrl+f, f
       Scroll down N pages (default: 1).
@@ -408,20 +394,6 @@
       Up-arrow,
         k, Ctrl-p
       Move the selection cursor up N pages (default: 1).
-      Right-arrow,
-        l
-      Scroll view to the right N increments (default: 1).
-        

-        File output moves left on the screen.
-      Left-arrow,
-        h
-      Scroll view to the left N increments (default: 1).
-        

-        File output moves right on the screen.
-      $
-      Scroll view to the rightmost position.
-      0
-      Scroll view left to the start of the line.
       Page-down,
         Space, Ctrl+f, f
       Move the selection cursor down N pages (default: 1).
@@ -797,7 +769,7 @@
 
 
 January 30,
+  line">February 22,
   2023 OpenBSD 7.2