commit 46043f6f089d22d60f5cb39d56b0763299a79b11 from: Stefan Sperling date: Tue Nov 23 15:41:03 2021 UTC sync man pages commit - 8e7a84a9edef535e766bcc00affe76d0d1c1a182 commit + 46043f6f089d22d60f5cb39d56b0763299a79b11 blob - d99d5541b2ccc53d129dfc95a34d71f73d440c5c blob + 30fe9d230440b31cf7069ecbce08bdbc36471c06 --- git-repository.5.html +++ git-repository.5.html @@ -209,7 +209,7 @@ - +
November 21, 2021November 23, 2021 OpenBSD 7.0
blob - aa43f966603ce6fd047ce0f145ed67462c206787 blob + f48e9d886be4a6d54c86f12344fc56bc00bfc4f3 --- got-worktree.5.html +++ got-worktree.5.html @@ -182,7 +182,7 @@ - +
November 21, 2021November 23, 2021 OpenBSD 7.0
blob - 4f87fa44cd6c805c62f84f37dca21216bcacb085 blob + f43159ebbbea6be87a33ddd6175bbbfcbace6e31 --- got.1.html +++ got.1.html @@ -91,9 +91,9 @@ directory
(alias: - im
- ) Create an initial commit in a repository from the file hierarchy within - the specified directory. The created commit will not + im) + Create an initial commit in a repository from the file hierarchy within the + specified directory. The created commit will not have any parent commits, i.e. it will be a root commit. Also create a new reference which provides a branch name for the newly created commit. Show the path of each imported file to indicate progress. @@ -141,13 +141,13 @@ [directory]
(alias: - cl
- ) Clone a Git repository at the specified - repository-URL into the specified - directory. If no directory is - specified the directory name will be derived from the name of the cloned - repository. got clone will refuse to run if the - directory already exists. + cl) + Clone a Git repository at the specified repository-URL + into the specified directory. If no + directory is specified the directory name will be + derived from the name of the cloned repository. got + clone will refuse to run if the directory + already exists.

The repository-URL specifies a protocol scheme, a server hostname, an optional port number separated from the hostname by a colon, and a path to the repository on the server: @@ -266,8 +266,8 @@ [-X] [remote-repository]

(alias: - fe
- ) Fetch new changes from a remote repository. If no + fe) + Fetch new changes from a remote repository. If no remote-repository is specified, “origin” will be used. The remote repository's URL is obtained from the corresponding entry in got.conf(5) or @@ -390,8 +390,8 @@ [work-tree-path]
(alias: - co
- ) Copy files from a repository into a new work tree. Show the status of each + co) + Copy files from a repository into a new work tree. Show the status of each affected file, using the following status codes: @@ -451,8 +451,8 @@ [-q] [path ...]
(alias: - up
- ) Update an existing work tree to a different commit. + up) + Update an existing work tree to a different commit. Change existing files in the work tree as necessary to match file contents of this commit. Preserve any local changes in the work tree and merge them with the incoming changes. @@ -555,8 +555,8 @@ status-codes] [path ...]
(alias: - st
- ) Show the current modification status of files in a work tree, using the + st) + Show the current modification status of files in a work tree, using the following status codes:
@@ -774,8 +774,8 @@ path ...]
(alias: - di
- ) When invoked within a work tree without any arguments, display all local + di) + When invoked within a work tree without any arguments, display all local changes in the work tree. If one or more path arguments are specified, only show changes within the specified paths.

If two arguments are provided, treat each argument as a @@ -840,8 +840,8 @@ path

(alias: - bl
- ) Display line-by-line history of a file at the specified path. + bl) + Display line-by-line history of a file at the specified path.

The options for got blame are as follows:

@@ -868,8 +868,8 @@ [path]
(alias: - tr
- ) Display a listing of files and directories at the specified directory path + tr) + Display a listing of files and directories at the specified directory path in the repository. Entries shown in this listing may carry one of the following trailing annotations:
@@ -921,10 +921,10 @@
[-r repository-path] - [-l] [-c - object] [-s - reference] [-d] - [name]
+ [-l] [-t] + [-cobject] + [-sreference] + [-d] [name]
Manage references in a repository.

References may be listed, created, deleted, and changed. When creating, deleting, or changing a reference the specified @@ -945,7 +945,13 @@ name is a reference namespace, list all references in this namespace. Otherwise, show only the reference with the given name. Cannot be used together with any - other options except -r.

+ other options except -r and + -t. +
+
Sort listed references by modification time (most recently modified + first) instead of sorting by lexicographical order. Use of this option + requires the -l option to be used as + well.
object
Create a reference or change an existing reference. The reference with @@ -982,8 +988,8 @@ [name]
(alias: - br
- ) Create, list, or delete branches. + br) + Create, list, or delete branches.

Local branches are managed via references which live in the “refs/heads/” reference namespace. The got branch command creates references in this @@ -1068,6 +1074,13 @@

+
+
Sort listed branches by modification time (most recently modified + first) instead of sorting by lexicographical order. Branches in the + “refs/heads/” reference namespace are listed before + branches in “refs/remotes/” regardless. Use of this + option requires the -l option to be used as + well.
name
Delete the branch with the specified name from @@ -1159,9 +1172,9 @@ status-codes] path ...
(alias: - rm
- ) Remove versioned files from a work tree and schedule them for deletion - from the repository in the next commit. + rm) + Remove versioned files from a work tree and schedule them for deletion from + the repository in the next commit.

The options for got remove are as follows:

@@ -1200,8 +1213,8 @@ path ...
(alias: - rv
- ) Revert any local changes in files at the specified paths in a work tree. + rv) + Revert any local changes in files at the specified paths in a work tree. File contents will be overwritten with those contained in the work tree's base commit. There is no way to bring discarded changes back after got revert! @@ -1238,8 +1251,8 @@ [path ...]
(alias: - ci
- ) Create a new commit in the repository from changes in a work tree and use + ci) + 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 tree. Otherwise, commit changes at or within the specified paths. @@ -1335,8 +1348,8 @@ [-v] [remote-repository]
(alias: - se
- ) Send new changes to a remote repository. If no + se) + Send new changes to a remote repository. If no remote-repository is specified, “origin” will be used. The remote repository's URL is obtained from the corresponding entry in got.conf(5) or @@ -1422,7 +1435,7 @@ repository is located at or above the current working directory. If this directory is a got work tree, use the repository path associated with this work tree.
-
+
tag
Send the specified tag from the local repository's “refs/tags/” reference namespace, in @@ -1458,13 +1471,12 @@ commit
(alias: - cy
- ) Merge changes from a single commit into the work - tree. The specified commit should be on a different - branch than the work tree's base commit. The expected argument is a - reference or a commit ID SHA1 hash. An abbreviated hash argument will be - expanded to a full SHA1 hash automatically, provided the abbreviation is - unique. + cy) + Merge changes from a single commit into the work tree. + The specified commit should be on a different branch + than the work tree's base commit. The expected argument is a reference or + a commit ID SHA1 hash. An abbreviated hash argument will be expanded to a + full SHA1 hash automatically, provided the abbreviation is unique.

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

@@ -1516,8 +1528,8 @@ commit
(alias: - bo
- ) Reverse-merge changes from a single commit into the + bo) + Reverse-merge changes from a single commit into the work tree. The specified commit should be on the same branch as the work tree's base commit. The expected argument is a reference or a commit ID SHA1 hash. An abbreviated hash argument will be @@ -1576,13 +1588,13 @@ [branch]
(alias: - rb
- ) 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 - begins with the first descendant commit of the youngest common ancestor - commit shared by the specified branch and the work - tree's current branch, and stops once the tip commit of the specified + rb) + 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 begins + with the first descendant commit of the youngest common ancestor commit + shared by the specified branch and the work tree's + current branch, and stops once the tip commit of the specified branch has been rebased.

When got rebase is used as intended, the specified branch represents a local commit @@ -1675,6 +1687,11 @@ got commit commands will refuse to run while a rebase operation is in progress. Other commands which manipulate the work tree may be used for conflict resolution purposes.

+

If the specified branch is already based + on the work tree's current branch then no commits need to be rebased and + got rebase will simply switch the work tree to + the specified branch and update files in the work + tree accordingly.

The options for got rebase are as follows:

@@ -1729,9 +1746,9 @@ [-X] [branch]
(alias: - he
- ) Edit commit history between the work tree's current base commit and the - tip commit of the work tree's current branch. + he) + 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 the work tree's current branch must be set with got update -b to the branch which should be edited, unless this @@ -1939,8 +1956,8 @@ branch

(alias: - ig
- ) Integrate the specified branch into the work tree's + ig) + Integrate the specified branch into the work tree's current branch. Files in the work tree are updated to match the contents on the integrated branch, and the reference of the work tree's branch is changed to point at the head commit of the @@ -1993,8 +2010,8 @@ [-n] [branch]
(alias: - mg
- ) Create a merge commit based on the current branch of the work tree and the + mg) + Create a merge commit based on the current branch of the work tree and the specified branch. If a linear project history is desired, then use of got rebase should be preferred over got merge. However, even strictly @@ -2110,8 +2127,8 @@ [-S] [path ...]
(alias: - sg
- ) Stage local changes for inclusion in the next commit. If no + sg) + Stage local changes for inclusion in the next commit. If no path is specified, stage all changes in the work tree. Otherwise, stage changes at or within the specified paths. Paths may be staged if they are added, modified, or deleted according to @@ -2201,8 +2218,8 @@ response-script] [path ...]
(alias: - ug
- ) Merge staged changes back into the work tree and put affected paths back + ug) + Merge staged changes back into the work tree and put affected paths back into non-staged status. If no path is specified, unstage all staged changes across the entire work tree. Otherwise, unstage changes at or within the specified paths. @@ -2674,7 +2691,7 @@
- +
November 21, 2021November 23, 2021 OpenBSD 7.0
blob - e79baf26bbf3a2a760329bf980cfa2dcf57b2bb9 blob + d4f8efa1e3d6ac22a279ed5823b7f206a7ef9cb4 --- got.conf.5.html +++ got.conf.5.html @@ -267,7 +267,7 @@ - +
November 21, 2021November 23, 2021 OpenBSD 7.0
blob - 32a27e3ba20122598397cae32d358b896f443c02 blob + 22e105c0e96b8f0fa0c3fd1d4b508337c7722d0d --- gotadmin.1.html +++ gotadmin.1.html @@ -79,7 +79,9 @@
repository-path
Use the repository at the specified path. If not specified, assume the - repository is located at or above the current working directory.
+ repository is located at or above the current working directory. If + this directory is a got(1) work tree, use the + repository path associated with this work tree.
@@ -108,7 +110,9 @@
repository-path
Use the repository at the specified path. If not specified, assume the - repository is located at or above the current working directory.
+ repository is located at or above the current working directory. If + this directory is a got(1) work tree, use the + repository path associated with this work tree.
reference
Exclude objects reachable via the specified @@ -128,8 +132,8 @@ packfile-path
(alias: - ix
- ) Create a pack index for the pack file at + ix) + Create a pack index for the pack file at packfile-path.

A pack index is required for using the corresponding pack file with got(1). Usually, a pack index will be created by @@ -149,8 +153,8 @@ packfile-path

(alias: - ls
- ) List the contents of the pack file at packfile-path. + ls) + List the contents of the pack file at packfile-path.

Each object contained in the pack file will be displayed on a single line. The information shown includes the object ID, object type, object offset, and object size.

@@ -178,9 +182,9 @@ repository-path] [-q]
(alias: - cl
- ) Purge unreferenced loose objects from the repository and display the - amount of disk space which has been freed as a result. + cl) + Purge unreferenced loose objects from the repository and display the amount + of disk space which has been freed as a result.

Unreferenced objects are present in the repository but cannot be reached via any reference in the entire refs/ namespace.

@@ -242,7 +246,9 @@
repository-path
Use the repository at the specified path. If not specified, assume the - repository is located at or above the current working directory.
+ repository is located at or above the current working directory. If + this directory is a got(1) work tree, use the + repository path associated with this work tree.
Suppress progress reporting and disk space summary output.
@@ -296,7 +302,7 @@ - +
November 21, 2021November 23, 2021 OpenBSD 7.0
blob - 31b7133c75daedb5bc0e0be4d7203106bc7bfa68 blob + 9e3dd092ffa0f492a71c162a6a2f358b44eaa6ab --- gotweb.8.html +++ gotweb.8.html @@ -145,7 +145,7 @@ - +
November 21, 2021November 23, 2021 OpenBSD 7.0
blob - 65ad33de7291852671ad35ae6a6d301a4778cb5e blob + 64f0e6603fdb1b079894be0a5d5f2b0dbffe2878 --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -161,7 +161,7 @@ got_logo_url "https://gameoftrees.org" - +
November 21, 2021November 23, 2021 OpenBSD 7.0
blob - bf20087d498dd640ad1fbb6fb9e0765a260b6cbf blob + 005d0431bcaa7b19588756420dbb232fb0df9ada --- tog.1.html +++ tog.1.html @@ -477,6 +477,9 @@
Show object IDs for all non-symbolic references displayed in the ref view.
+
+
Toggle display order of references between sort by name and sort by + timestamp.
Prompt for a search pattern and start searching for matching references. The search pattern is an extended regular expression which @@ -585,7 +588,7 @@ - +
November 21, 2021November 23, 2021 OpenBSD 7.0