commit 039953c9e4a0736bf3e6ea3dc09992bdc2f7b244 from: Stefan Sperling date: Mon Mar 22 11:49:35 2021 UTC sync man pages commit - ef1f07d6c26bcb8099862f56114396ede2fee5bf commit + 039953c9e4a0736bf3e6ea3dc09992bdc2f7b244 blob - 130fe0700abd2791e970ade87f388af70253636f blob + ec49f4929b2b059a5a0a4b6f3d2250df1170032e --- git-repository.5.html +++ git-repository.5.html @@ -217,7 +217,7 @@ - +
December 27, 2020March 22, 2021 OpenBSD 6.8
blob - a77994fccee32fc711f3278ee43b06b53a335f00 blob + 14cb2ad12a632d715a84f743680ee81f01533f7a --- got-worktree.5.html +++ got-worktree.5.html @@ -191,7 +191,7 @@ - +
December 27, 2020March 22, 2021 OpenBSD 6.8
blob - edfff52eddc2a5136e07ff423703cca01f218a0b blob + 00cdf8ed340cbda76be55b3f69d01f753996e033 --- got.1.html +++ got.1.html @@ -181,17 +181,22 @@

got clone creates a remote repository entry in the got.conf(5) and config files of the cloned repository to store - the repository-url for future use by - got fetch or git-fetch(1).

+ the repository-url and any + branch or reference + arguments for future use by got fetch or + git-fetch(1).

The options for got clone are as follows:

Fetch all branches from the remote repository's - “refs/heads/” reference namespace. 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.
+ “refs/heads/” reference namespace and set + fetch-all-branches in the cloned repository's + got.conf(5) file for future use by + got 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 -b + option.
branch
Fetch the specified branch from the remote @@ -206,7 +211,8 @@
List branches and tags available for fetching from the remote repository and exit immediately. Cannot be used together with any of - the other options except -v.
+ the other options except -q and + -v.
Create the cloned repository as a mirror of the original repository. This is useful if the cloned repository will not be used to store @@ -296,10 +302,12 @@
Fetch all branches from the remote repository's - “refs/heads/” reference namespace. 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.
+ “refs/heads/” reference namespace. This option can be + enabled by default for specific repositories in + 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.
branch
Fetch the specified branch from the remote @@ -317,8 +325,8 @@
List branches and tags available for fetching from the remote repository and exit immediately. Cannot be used together with any of - the other options except -v and - -r.
+ the other options except -v, + -q, and -r.
Allow existing references in the “refs/tags” namespace to be updated if they have changed on the server. If not specified, @@ -719,7 +727,7 @@ commits in reverse order.
commit
-
Stop traversing commit history as soon as the specified +
Stop traversing commit history immediately after the specified commit has been traversed. This option has no effect if the specified commit is never traversed.
@@ -897,8 +905,10 @@ -r.
Delete the reference with the specified name - from the repository. Cannot be used together with any other options - except -r.
+ from the repository. Any commit, tree, tag, and blob objects belonging + to deleted references remain in the repository and may be removed + separately with Git's garbage collector. Cannot be used together with + any other options except -r.
@@ -908,10 +918,10 @@ name] [-n] [name]
Create, list, or delete branches. -

Branches are managed via references which live in the +

Local branches are managed via references which live in the “refs/heads/” reference namespace. The - got branch command operates on references in - this namespace only.

+ got branch command creates or deletes references + in this namespace only.

If invoked in a work tree without any arguments, print the name of the work tree's current branch.

If a name argument is passed, attempt to @@ -972,9 +982,11 @@ this directory is a got work tree, use the repository path associated with this work tree.

-
List all existing branches in the repository. If invoked in a work - tree, the work tree's current branch is shown with one the following - annotations: +
List all existing branches in the repository, including copies of + remote repositories' branches in the “refs/remotes/” + reference namespace. +

If invoked in a work tree, the work tree's current branch + is shown with one the following annotations:

@@ -1145,8 +1157,10 @@
Short alias for revert.
+ [-F path] [-m message] - [-S] [path ...]
+ [-N] [-S] + [path ...]
Create a new commit in the repository from changes in a work tree and use this commit as the new base commit for the work tree. If no path is specified, commit all changes in the work @@ -1154,6 +1168,11 @@

If changes have been explicitly staged for commit with got stage, only commit staged changes and reject any specified paths which have not been staged.

+

got commit opens a temporary file in + an editor where a log message can be written unless the + -m option is used or the + -F and -N options are + used together.

Show the status of each affected file, using the following status codes:

*
@@ -1191,12 +1210,23 @@

The options for got commit are as follows:

+
+ path
+
Use the prepared log message stored in the file found at + path when creating the new commit. + got commit opens a temporary file in an editor + where the prepared log message can be reviewed and edited further if + needed. Cannot be used together with the -m + option.
message
-
Use the specified log message when creating the new commit. Without - the -m option, got - commit opens a temporary file in an editor where a log message - can be written.
+
Use the specified log message when creating the new commit. Cannot be + used together with the -F option.
+
+
This option prevents got commit from opening + 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.
Allow the addition of symbolic links which point outside of the path space that is under version control. By default, got @@ -1335,7 +1365,7 @@
Short alias for backout.
[-a] [-c] - [branch]
+ [-l] [branch]
Rebase commits on the specified branch onto the tip of the current branch of the work tree. The branch must share common ancestry with the work tree's current branch. Rebasing @@ -1360,6 +1390,13 @@ rebasing has completed successfully, the temporary branch becomes the new version of the specified branch and the work tree is automatically switched to it.

+

Old commits in their pre-rebase state are automatically backed + up in the “refs/got/backup/rebase” reference namespace. As + long as these references are not removed older versions of rebased + commits will remain in the repository and can be viewed with the + got rebase -l command. Removal of these + references makes objects which become unreachable via any reference + subject to removal by Git's garbage collector.

While rebasing commits, show the status of each affected file, using the following status codes:

@@ -1429,6 +1466,25 @@
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 + up commit, the object ID of the corresponding post-rebase commit, + and the object ID of their common ancestor commit. Given these + object IDs, the got log command with the + -c and -x options + can be used to examine the history of either version of the branch, + and the got branch command with the + -c option can be used to create a new branch + from a pre-rebase state if desired.

+

If a branch is specified, only show + commits which at some point in time represented this branch. + Otherwise, list all backed up commits for any branches.

+

If this option is used, got rebase + does not require a work tree. None of the other options can be used + together with -l.

+
@@ -1436,7 +1492,8 @@
[-a] [-c] [-f] [-F - histedit-script] [-m]
+ histedit-script] [-m] + [-l] [branch]
Edit commit history between the work tree's current base commit and the tip commit of the work tree's current branch.

Before starting a histedit operation @@ -1494,6 +1551,13 @@ operation. Once history editing has completed successfully, the temporary branch becomes the new version of the work tree's branch and the work tree is automatically switched to it.

+

Old commits in their pre-histedit state are automatically + backed up in the “refs/got/backup/histedit” reference + namespace. As long as these references are not removed older versions of + edited commits will remain in the repository and can be viewed with the + got histedit -l command. Removal of these + references makes objects which become unreachable via any reference + subject to removal by Git's garbage collector.

While merging commits, show the status of each affected file, using the following status codes:

@@ -1572,7 +1636,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. -
+
histedit-script
Use the specified histedit-script instead of opening a temporary file in an editor where a histedit script can be @@ -1583,6 +1647,25 @@ 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.
+
+
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 + up commit, the object ID of the corresponding post-histedit commit, + and the object ID of their common ancestor commit. Given these + object IDs, the got log command with the + -c and -x options + can be used to examine the history of either version of the branch, + and the got branch command with the + -c option can be used to create a new branch + from a pre-histedit state if desired.

+

If a branch is specified, only show + commits which at some point in time represented this branch. + Otherwise, list all backed up commits for any branches.

+

If this option is used, got + histedit does not require a work tree. None of the other + options can be used together with -l.

+
@@ -1683,7 +1766,7 @@

The options for got stage are as follows:

-
+
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 in the command line show the staged paths among @@ -1696,7 +1779,7 @@ 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.
-
+
response-script
With the -p option, read “y”, “n”, and “q” responses line-by-line from @@ -1776,7 +1859,7 @@ 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.
-
+
response-script
With the -p option, read “y”, “n”, and “q” responses line-by-line from @@ -1948,8 +2031,8 @@ called “unified-buffer-cache” which is forked off the “master” branch:

-
$ got branch unified-buffer-cache - master
+
$ got branch -c master + unified-buffer-cache

Switch an existing work tree to the branch “unified-buffer-cache”. Local changes in the work tree will be preserved and merged if necessary:

@@ -2004,12 +2087,9 @@ cache'

Alternatively, create a new commit from local changes in a work tree directory with a log message that has been prepared in the file - /tmp/msg. If vi(1) is set as the - EDITOR, /tmp/msg can be read - into the buffer for review:

+ /tmp/msg:

-
$ got commit
-
:r /tmp/msg
+
$ got commit -F /tmp/msg

Update any work tree checked out from the “unified-buffer-cache” branch to the latest commit on this branch:

@@ -2198,7 +2278,7 @@
- +
December 27, 2020March 22, 2021 OpenBSD 6.8
blob - 0f696ca9452e5e67f5f57d4a7e41a51aba4603aa blob + 7d265ba8051f731f658df1b62b1085a3633a3e44 --- gotweb.8.html +++ gotweb.8.html @@ -73,8 +73,10 @@ appropriate configuration file sample.
  • httpd(8) and slowcgi(8) must be enabled and started:
    - 
      # rcctl enable httpd slowcgi
-  # rcctl start httpd slowcgi
    + 
    +  # rcctl enable httpd slowcgi
+  # rcctl start httpd slowcgi
+
  • Optionally, the run-time behaviour of gotweb can @@ -122,6 +124,7 @@

    Example configuration for httpd.conf:

    +
   types { include "/usr/share/misc/mime.types" }
   server "gotweb.example.com" {
   	listen on * port 80
@@ -133,7 +136,8 @@
   	location "/*" {
   		directory index "index.html"
   	}
-  }
    + } +
    @@ -154,7 +158,7 @@ - +
    December 27, 2020March 22, 2021 OpenBSD 6.8
    blob - 3f8c654a285aaf2baedb57e6e61451157dd22fa1 blob + 14c5cbb015affdcc9e4ff834f62a57cfc0b93f50 --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -100,8 +100,10 @@ in the repository. gotweb(8) will parse owner information from either a [gotweb] or a [gitweb] section. For example:
    - 
    [gotweb]
-owner = "Your Name"
    + 
    +[gotweb]
+owner = "Your Name"
+