commit 63b698215d3827d69ecf1c8b0cb96e2b4c836c67 from: Stefan Sperling date: Sat Oct 16 12:49:13 2021 UTC sync man pages commit - 7127aa47f82ce60c3de6a0dbd3c350100ea423c0 commit + 63b698215d3827d69ecf1c8b0cb96e2b4c836c67 blob - 683d8411a544d1d56b0d5f9e3902ab95d46b5d66 blob + d018de5c553f0291e4d6402472bc37e677ea83cd --- git-repository.5.html +++ git-repository.5.html @@ -219,7 +219,7 @@ - +

October 3, 2021

October 16, 2021

OpenBSD 7.0

blob - 55ab265e049976b4ad3cbdc014886408a2dcf896 blob + db2bded73faf9fbbe2520ff5089f5b977d4ec929 --- got-worktree.5.html +++ got-worktree.5.html @@ -192,7 +192,7 @@ - +

October 3, 2021

October 16, 2021

OpenBSD 7.0

blob - e2e3e3fd03ceb92bdc40b93df90855e7e3fa8d06 blob + 76a74470a695e9e3d7359212e5081488001bda79 --- got.1.html +++ got.1.html @@ -93,13 +93,16 @@ empty repository before got checkout can be used.

import +

import [-b branch] [-m message] [-r repository-path] [-I pattern] directory

Create an initial commit in a repository from the file hierarchy within +

(alias:
+      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 @@ -139,16 +142,17 @@ glob(7).

im

Short alias for import.

clone +

clone [-a] [-b branch] [-l] [-m] [-q] [-v] [-R reference] repository-URL [directory]

Clone a Git repository at the specified +

(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 @@ -262,9 +266,7 @@

cl

Short alias for clone.

fetch +

fetch [-a] [-b branch] [-d] [-l] [-r @@ -272,7 +274,10 @@ [-q] [-v] [-R reference] [-X] [remote-repository]

Fetch new changes from a remote repository. If no +

(alias:
+      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 @@ -386,16 +391,17 @@

fe

Short alias for fetch.

checkout +

checkout [-E] [-b branch] [-c commit] [-p path-prefix] [-q] repository-path [work-tree-path]

Copy files from a repository into a new work tree. Show the status of each +

(alias:
+      co

+ ) Copy files from a repository into a new work tree. Show the status of each affected file, using the following status codes: @@ -449,13 +455,14 @@

Silence progress output.

co

Short alias for checkout.

update +

update [-b branch] [-c commit] [-q] [path ...]

Update an existing work tree to a different commit. +

(alias:
+      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. @@ -552,13 +559,14 @@

Silence progress output.

up

Short alias for update.

status +

status [-I] [-s status-codes] [-S status-codes] [path ...]

Show the current modification status of files in a work tree, using the +

(alias:
+      st

+ ) Show the current modification status of files in a work tree, using the following status codes:

@@ -671,8 +679,6 @@ gives no special significance to the location of path component separators, “/”, in a pattern.

st

Short alias for status.

log [-b] [-c commit] [-C @@ -768,27 +774,53 @@ traversed. -

diff - [-a] [-C +

diff + [-a] [-c + commit] [-C number] [-r repository-path] [-s] - [-w] [object1 - object2 | path]

When invoked within a work tree with less than two arguments, display - local changes in the work tree. If a path is - specified, only show changes within this path. + [-P] [-w] + [object1 object2 | + path ...] +

(alias:
+      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 reference, a tag name, or an object ID SHA1 hash, and display differences between the corresponding objects. Both objects must be of the same type (blobs, trees, or commits). An abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the - abbreviation is unique.

+ abbreviation is unique. If none of these interpretations produce a valid + result or if the -P option is used, and if + got diff is running in a work tree, attempt to + interpret the two arguments as paths.

The options for got diff are as follows:

-a

Treat file contents as ASCII text even if binary data is detected.

-c + commit

Show differences between commits in the repository. This options may + be used up to two times. When used only once, show differences between + the specified commit and its first parent + commit. When used twice, show differences between the two specified + commits. +

The expected argument is a commit ID SHA1 hash or an + existing reference or tag name which will be resolved to a commit + ID. An abbreviated hash argument will be expanded to a full SHA1 + hash automatically, provided the abbreviation is unique.

If the -c option is used, all + non-option arguments will be interpreted as paths. If one or more + such path arguments are provided, only show + differences for the specified paths.

Cannot be used together with the + -P option.

-C number

Set the number of context lines shown in the diff. By default, 3 lines @@ -803,21 +835,27 @@

Show changes staged with got stage instead of showing local changes in the work tree. This option is only valid when got diff is invoked in a work tree.

-P

Interpret all arguments as paths only. This option can be used to + resolve ambiguity in cases where paths look like tag names, reference + names, or object IDs. This option is only valid when + got diff is invoked in a work tree.

-w

Ignore whitespace-only changes.

di

Short alias for diff.

blame +

blame [-c commit] [-r repository-path] path

Display line-by-line history of a file at the specified path. +

(alias:
+      bl

+ ) Display line-by-line history of a file at the specified path.

The options for got blame are as follows:

-c +
-c commit: Start traversing history at the specified commit. The expected argument is a commit ID @@ -833,14 +871,15 @@ repository path associated with this work tree.

bl

Short alias for blame.

tree +

tree [-c commit] [-r repository-path] [-i] [-R] [path]

Display a listing of files and directories at the specified directory path +

(alias:
+      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:

@@ -869,7 +908,7 @@

The options for got tree are as follows:

-c +
-c commit: List files and directories as they appear in the specified commit. The expected argument is a commit ID @@ -890,8 +929,6 @@; Recurse into sub-directories in the repository.

tr

Short alias for tree.

ref [-r repository-path] [-l] [-c @@ -919,7 +956,7 @@ references in this namespace. Otherwise, show only the reference with the given name. Cannot be used together with any other options except -r. -

-c +

-c object

Create a reference or change an existing reference. The reference with the specified name will point at the specified @@ -947,13 +984,16 @@ -r.

branch +

branch [-c commit] [-r repository-path] [-l] [-d name] [-n] [name]

Create, list, or delete branches. +

(alias:
+      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 @@ -1008,7 +1048,7 @@

The options for got branch are as follows:

-c +
-c commit: Make a newly created branch reference point at the specified commit. The expected @@ -1053,8 +1093,6 @@ branch.

br

Short alias for branch.

tag [-c commit] [-m message] @@ -1076,7 +1114,7 @@

The options for got tag are as follows:

-c +
-c commit: Make the newly created tag reference point at the specified commit. The expected @@ -1125,11 +1163,14 @@ ignore pattern.

remove +

remove [-f] [-k] [-R] [-s status-codes] path ...

Remove versioned files from a work tree and schedule them for deletion +

(alias:
+      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:

@@ -1163,13 +1204,14 @@

rm

Short alias for remove.

revert +

revert [-p] [-F response-script] [-R] path ...

Revert any local changes in files at the specified paths in a work tree. +

(alias:
+      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! @@ -1199,14 +1241,15 @@ path is a directory.

rv

Short alias for revert.

commit +

commit [-F path] [-m message] [-N] [-S] [path ...]

Create a new commit in the repository from changes in a work tree and use +

(alias:
+      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. @@ -1292,9 +1335,7 @@ got update must be used first in order to merge local changes with changes made in the repository.

ci

Short alias for commit.

send +

send [-a] [-b branch] [-d branch] [-f] @@ -1302,7 +1343,10 @@ [-t tag] [-T] [-q] [-v] [remote-repository]

Send new changes to a remote repository. If no +

(alias:
+      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 @@ -1420,11 +1464,12 @@ increase the verbosity. The maximum is 3.

se

Short alias for send.

cherrypick +

cherrypick commit

Merge changes from a single commit into the work +

(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 @@ -1477,11 +1522,12 @@ got update. If any relevant files already contain merge conflicts, these conflicts must be resolved first.

cy

Short alias for cherrypick.

backout +

backout commit

Reverse-merge changes from a single commit into the +

(alias:
+      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 @@ -1534,13 +1580,14 @@ got update. If any relevant files already contain merge conflicts, these conflicts must be resolved first.

bo

Short alias for backout.

rebase +

rebase [-a] [-c] [-l] [-X] [branch]

Rebase commits on the specified branch onto the tip +

(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 @@ -1644,7 +1691,7 @@

-a

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

-c

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

-l

@@ -1684,15 +1731,16 @@ -

rb

Short alias for rebase.

histedit +

histedit [-a] [-c] [-e] [-f] [-F histedit-script] [-m] [-l] [-X] [branch]

Edit commit history between the work tree's current base commit and the +

(alias:
+      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 @@ -1833,7 +1881,7 @@

-a

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


-      -c
+      -c
       Continue an interrupted histedit operation. If this option is used, no
           other command-line arguments are allowed.
       -e
@@ -1897,11 +1945,12 @@
       
     
   
-  he
-  Short alias for histedit.
-  integrate
+  
integrate
     branch
-  Integrate the specified branch into the work tree's
+  

+    (alias:
+      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
@@ -1949,12 +1998,13 @@
         must first be committed with got commit or
         reverted with got revert.
   
-  ig
-  Short alias for integrate.
-  merge
+  
merge
     [-a] [-c]
     [-n] [branch]
-  Create a merge commit based on the current branch of the work tree and the
+  

+    (alias:
+      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
@@ -2053,7 +2103,7 @@
       
-a
       Abort an interrupted merge operation. If this option is used, no other
           command-line arguments are allowed.
-      -c
+      -c
       Continue an interrupted merge operation. If this option is used, no
           other command-line arguments are allowed.
       -n
@@ -2064,13 +2114,14 @@
           merge -a

. -

mg

Short alias for merge.

stage +

stage [-l] [-p] [-F response-script] [-S] [path ...]

Stage local changes for inclusion in the next commit. If no +

(alias:
+      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 @@ -2155,12 +2206,13 @@ updated with got update, and may then be staged again if necessary.

sg

Short alias for stage.

unstage +

unstage [-p] [-F response-script] [path ...]

Merge staged changes back into the work tree and put affected paths back +

(alias:
+      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. @@ -2211,8 +2263,6 @@ prompting interactively.

ug

Short alias for unstage.

cat [-c commit] [-r repository-path] @@ -2233,7 +2283,7 @@

The options for got cat are as follows:

-c +
-c commit: Look up paths in the specified commit. If this option is not used, paths are looked up in the commit resolved via the @@ -2247,7 +2297,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.
-P
-P: Interpret all arguments as paths only. This option can be used to resolve ambiguity in cases where paths look like tag names, reference names, or object IDs.

- +

October 3, 2021

October 16, 2021

OpenBSD 7.0

blob - a442e641d81204862a9da3df8477f8a37b12519d blob + fd9481b2df276f0bc8852f7427a06152baf5fe04 --- got.conf.5.html +++ got.conf.5.html @@ -277,7 +277,7 @@ - +

October 3, 2021

October 16, 2021

OpenBSD 7.0

blob - 0d6a32a1fc77482b7d998624f471684bbfe7703b blob + a3e15b76a95ccd576c67a4991bfe81cc32d8eac7 --- gotadmin.1.html +++ gotadmin.1.html @@ -134,9 +134,12 @@

indexpack +

indexpack packfile-path

Create a pack index for the pack file at +

(alias:
+      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 @@ -151,12 +154,13 @@ filename of the corresponding pack index is equivalent, except that it ends in .idx.

ix

Short alias for indexpack.

listpack +

listpack [-h] [-s] packfile-path

List the contents of the pack file at packfile-path. +

(alias:
+      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,13 +182,14 @@ break-down of the number of objects per object type.

ls

Short alias for listpack.

cleanup +

cleanup [-a] [-p] [-n] [-r repository-path] [-q]

Purge unreferenced loose objects from the repository and display the +

(alias:
+      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/ @@ -252,8 +257,6 @@

Suppress progress reporting and disk space summary output.

cl

Short alias for cleanup.

@@ -303,7 +306,7 @@ - +

October 3, 2021

October 16, 2021

OpenBSD 7.0

blob - 93b2503364dc77b97ced6c6bd2a8d22ebe29890a blob + ccd0acc3767f8655fcfd6dce6542a475c7f72a1c --- gotweb.8.html +++ gotweb.8.html @@ -155,7 +155,7 @@ - +

October 3, 2021

October 16, 2021

OpenBSD 7.0

blob - 1406d2a29c03fb22e542b5ce95e9c71707d4cd11 blob + bc7dfab4868268897de4cce4591f0d24c2975ba8 --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -171,7 +171,7 @@ got_logo_url "https://gameoftrees.org" - +

October 3, 2021

October 16, 2021

OpenBSD 7.0

blob - 21c63c0e9a5fcbc2d7ea6d171b86b27747c548a6 blob + b5c1612fdcb6a2f32b2b498de92b2c1739d6e1d5 --- tog.1.html +++ tog.1.html @@ -595,7 +595,7 @@ - +

October 3, 2021

October 16, 2021

OpenBSD 7.0