commit b6df88e2587e6f6d323c5afbb639d23a3c38ff5f from: Stefan Sperling date: Sat Dec 28 16:26:32 2024 UTC sync manual pages commit - 13ab3555c0a8cc4e77df44b1cd27ad1c1da9985c commit + b6df88e2587e6f6d323c5afbb639d23a3c38ff5f blob - 7d9eceaa69beb444cf859be1b18da0c8e1525528 blob + 68bc0dbac992e82e81446f8a947474fb8af01cf8 --- git-repository.5.html +++ git-repository.5.html @@ -141,7 +141,7 @@
HEAD
A reference to the current head commit of the Git work tree. In bare - repositories, this files serves as a default reference.
+ repositories, this file serves as a default reference.
ORIG_HEAD
Reference to original head commit. Set by some Git operations.
FETCH_HEAD
@@ -215,7 +215,7 @@
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - 460f1d82db7a084d40b75d48137de3a78a9efbbc blob + aa58d04aab8c75861ec96ec89f8b6daf07f4a906 --- gitwrapper.1.html +++ gitwrapper.1.html @@ -142,7 +142,7 @@
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - a537c3d7ba9e88ef256b8f87d22076bb9acbfb2e blob + 7cfa986b4794cf310f0aedda5949976a3919f39c --- got-worktree.5.html +++ got-worktree.5.html @@ -187,7 +187,7 @@
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - 79ce46d5377bea5c2eb56107a41166b239fac03b blob + 7d53b06b795b1633ba6dc76c6f5dd02959e3c086 --- got.1.html +++ got.1.html @@ -173,7 +173,8 @@
[-almqv] [-b - branch] [-R + branch] [-J + jumphost] [-R reference] repository-URL [directory]
@@ -257,6 +258,11 @@ not specified, a branch resolved via the remote repository's HEAD reference will be fetched. Cannot be used together with the -a option.
+
+ jumphost
+
Specify a jumphost to use with SSH connections. + The same option will be passed to ssh(1).
List branches and tags available for fetching from the remote repository and exit immediately. Cannot be used together with any of @@ -315,7 +321,8 @@
[-adlqtvX] [-b - branch] [-R + branch] [-J + jumphost] [-R reference] [-r repository-path] [remote-repository]
@@ -388,6 +395,11 @@ commit, tree, tag, and blob objects belonging to deleted branches or tags remain in the repository and may be removed separately with Git's garbage collector or gotadmin cleanup. +
+ jumphost
+
Specify a jumphost to use with SSH connections. + The same option will be passed to ssh(1).
List branches and tags available for fetching from the remote repository and exit immediately. Cannot be used together with any of @@ -1340,10 +1352,10 @@
- [-lVv] [-c + [-lsVv] [-c commit] [-m message] [-r - repository-path] [-s + repository-path] [-S signer-id] name
Manage tags in a repository.

Tags are managed via references which live in the @@ -1403,7 +1415,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.

-
+
signer-id
While creating a new tag, sign this tag with the identity given in signer-id. @@ -1418,6 +1430,10 @@ compatibility with git(1).

+
+
Display a short one-line summary of each tag, instead of the default + history format. Can only be used with the -l + option.
Verify tag object signatures. If a name is specified, show and verify the tag object with the provided name. @@ -1788,7 +1804,7 @@
This option prevents got commit from generating a diff of the to-be-committed changes in a temporary file which can be viewed while editing a commit message.
-
+
Allow the addition of symbolic links which point outside of the path space that is under version control. By default, got commit will reject such symbolic links due to safety concerns. @@ -1811,7 +1827,8 @@
[-afqTv] [-b branch] [-d - branch] [-r + branch] [-J + jumphost] [-r repository-path] [-t tag] [remote-repository]
@@ -1900,6 +1917,11 @@ risks of creating inconsistencies between different repositories should also be taken into account.

+
+ jumphost
+
Specify a jumphost to use with SSH connections. + The same option will be passed to ssh(1).
Suppress progress reporting output. The same option will be passed to ssh(1) if @@ -2677,6 +2699,10 @@ branch into the work tree, show the status of each affected file, using the following status codes:

+ + + + @@ -2833,7 +2859,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. -
+
Allow staging of symbolic links which point outside of the path space that is under version control. By default, got stage will reject such symbolic links due to safety concerns. @@ -3612,7 +3638,7 @@ remote "origin" {
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - 40ef72a3f026a771121c1153fb948ea1d6547f94 blob + 17b97c10ecefab05249dd5277958bfa896c988f7 --- got.conf.5.html +++ got.conf.5.html @@ -325,7 +325,7 @@
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - d0b39159a0a957e57eae98fecd7d93dbad70478c blob + cb85e190fa489ef0e38cf7790ac6989af799c78e --- gotadmin.1.html +++ gotadmin.1.html @@ -443,7 +443,7 @@
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - 07fb8a6ecba5c49973fbd178bb98b436c93384ce blob + 75e217c0599510ce92c4d3a5b655db16dfa2468c --- gotctl.8.html +++ gotctl.8.html @@ -86,7 +86,7 @@
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - 45d240938e4126df60824e43ccc2fd9d0c745a3c blob + b6d0bf2a1d23c72636c0d80cd15ee4228f2d45d1 --- gotd-secrets.conf.5.html +++ gotd-secrets.conf.5.html @@ -112,7 +112,7 @@ repository "openbsd/src" {
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - 4180bae50794857c7b7a4f79fa10310de9a62607 blob + 9d9489fc8b78dea954a657ac5792f0308cdf6541 --- gotd.8.html +++ gotd.8.html @@ -143,7 +143,7 @@
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - b795fe54c5006bbac081a88a42b1c835ecfb3553 blob + caa6b9ea64b3f338687d9e07e0affb143841feaf --- gotd.conf.5.html +++ gotd.conf.5.html @@ -499,7 +499,7 @@ connection {
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - 23bf42bff2747d14cb10011b068ea38dc4368c7d blob + 3d1e86a295160e3a589c3dc962231d9d7ccdc2f0 --- gotsh.1.html +++ gotsh.1.html @@ -157,7 +157,7 @@
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - 9a59b707857e6d57240510410f0ad1ad536bfa5d blob + 1b68233cd9bebc4df5d6c0d8a134213e169e3717 --- gotwebd.8.html +++ gotwebd.8.html @@ -191,7 +191,7 @@ server "example.com" {
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - e154b91bb5dd0292515c5bd49e182a76c347d893 blob + 4dfbcebba887e3c733146eb66da1caea9efd901b --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -242,7 +242,7 @@ server "localhost" {
November 21, + line">December 28, 2024 OpenBSD 7.6
blob - b3a6b212fe6feeb2325c40a3b14b0e7eafc495e4 blob + 3e7faebe8976816f09919e2306469175c44d1343 --- tog.1.html +++ tog.1.html @@ -63,7 +63,7 @@ initially if no command is specified, or if just a path is specified.
Diff view
-
Displays changes made in a particular commit.
+
Displays work tree changes or changes made in a particular commit.
Blame view
Displays the line-by-line history of a file.
Tree view
@@ -254,7 +254,7 @@ key is pressed.
Reload the log view with new commits found in - the repository.
+ the repository or new work tree changes.
Reload the log view and toggle display of merged commits. The -b option determines @@ -309,31 +309,37 @@
- [-aw] [-C - number] [-r - repository-path] object1 - object2
-
Display the differences between two objects in the repository. Treat each - of the two arguments as a reference, a tag name, an object ID, or a - keyword 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 commit ID - automatically, provided the abbreviation is unique. The keywords - ":base" and ":head" resolve to the work tree's base - commit and branch head, respectively. The former is only valid if invoked - in a work tree, while the latter will resolve to the tip of the work - tree's current branch if invoked in a work tree, otherwise it will resolve - to the repository's HEAD reference. Keywords and references may be - appended with ":+" or ":-" modifiers and an optional - integer N to denote the Nth descendant or antecedent by first parent - traversal, respectively; for example, :head:-2 denotes - the work tree branch head's 2nd generation ancestor, and - :base:+4 denotes the 4th generation descendant of the - work tree's base commit. Similarly, foobar:+3 will - denote the 3rd generation descendant of the commit resolved by the - "foobar" reference. A ":+" or ":-" modifier - without a trailing integer has an implicit "1" appended (e.g., - :base:+ is equivalent to :base:+1). + [-asw] [-C + number] [-c + commit] [-r + repository-path] [object1 + object2 | path ...] +
If 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. +

Alternatively, if two object arguments are specified, display + the differences between the two objects in the repository. Treat each of + the two arguments as a reference, a tag name, an object ID, or a keyword + 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 commit ID automatically, provided + the abbreviation is unique. The keywords ":base" and + ":head" resolve to the work tree's base commit and branch + head, respectively. The former is only valid if invoked in a work tree, + while the latter will resolve to the tip of the work tree's current + branch if invoked in a work tree, otherwise it will resolve to the + repository's HEAD reference. Keywords and references may be appended + with ":+" or ":-" modifiers and an optional integer + N to denote the Nth descendant or antecedent by first parent traversal, + respectively; for example, :head:-2 denotes the work + tree branch head's 2nd generation ancestor, and + :base:+4 denotes the 4th generation descendant of the + work tree's base commit. Similarly, foobar:+3 will + denote the 3rd generation descendant of the commit resolved by the + "foobar" reference. A ":+" or ":-" + modifier without a trailing integer has an implicit "1" + appended (e.g., :base:+ is equivalent to + :base:+1).

The key bindings for tog diff are as follows (N denotes optional prefixed count modifier):

@@ -425,6 +431,23 @@ number
Set the number of context lines shown in the diff. By default, 3 lines of context are shown.
+
+ commit
+
Show differences between commits in the repository. This option 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 hash, or an existing + reference, tag name, or keyword, which is resolved to a commit ID. + Unique abbreviated hash arguments are automatically expanded to a + full hash. Both objects must be of the same type (i.e., blobs, + trees, or commits).

+

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

+
repository-path
Use the repository at the specified path. If not specified, assume the @@ -432,6 +455,11 @@ this directory is a got(1) work tree, use the repository path associated with this work tree.
+
+
Show changes staged with got stage instead of + showing local changes in the work tree. This option is only valid when + tog diff is invoked in a work tree with no + -c options.
Ignore whitespace-only changes.
@@ -474,7 +502,7 @@
Open a diff view for the currently selected line's commit.
-
+
Reload the blame view with the version of the file as found in the currently selected line's commit.
@@ -506,7 +534,7 @@

The options for tog blame are as follows:

-
+
commit
Start traversing history at the specified commit. The expected argument is a commit ID, or @@ -631,7 +659,7 @@

The options for tog tree are as follows:

-
+
commit
Start traversing history at the specified commit. The expected argument is a commit ID, or @@ -859,7 +887,7 @@
November 21, + line">December 28, 2024 OpenBSD 7.6
Ufile was updated
G file was merged