commit b183145b65deab64768d0fcab787025a68b43679 from: Omar Polo date: Wed Aug 14 19:36:34 2024 UTC sync manual pages commit - 9ce6226dca832c8fe930498a19bc3d7b457bc213 commit + b183145b65deab64768d0fcab787025a68b43679 blob - 33402467928cd5f681df651e315b79a2b0c5116a blob + 67184c461579ade5363aa4f17fac8478553935c3 --- git-repository.5.html +++ git-repository.5.html @@ -66,8 +66,10 @@ commit object. Tag objects also contain a tag message, as well as author and timestamp information. -

Each object is identified by a SHA1 hash calculated over both the - object's header and the data stored in the object.

+

Each object is identified by an hash calculated over both the + object's header and the data stored in the object. The hashing algorithm + used is specified in the repository config file for + newer repositories while older ones use SHA1 implicitly.

umask(2) is heeded.
Blob object ID
-
The SHA1 hash of the blob object which corresponds to the contents of this - file in the repository. The hash is stored as binary data.
+
The hash of the blob object which corresponds to the contents of this file + in the repository. The hash is stored as binary data. The size of the hash + depends on the hashing algorithm used in the repository.
Commit object ID
-
The SHA1 hash of the commit object the file was checked out from. The hash - is stored as binary data. This data is used to detect past incomplete - update operations. Entries which do not match the work tree's base commit - may still need to be updated to match file content stored in the base - commit.
+
The hash of the commit object the file was checked out from. The hash is + stored as binary data. This data is used to detect past incomplete update + operations. Entries which do not match the work tree's base commit may + still need to be updated to match file content stored in the base + commit.
Flags
This field contains the length, according to strlen(3), of path data @@ -113,9 +114,9 @@
The path of the entry, relative to the work tree root. Path data is of variable length and NUL-padded to a multiple of 8 bytes.
Staged blob object ID
-
The SHA1 hash of a blob object containing file content which has been - staged for commit. The hash is stored as binary data. Only present if a - file addition or modification has been staged with got +
The hash of a blob object containing file content which has been staged + for commit. The hash is stored as binary data. Only present if a file + addition or modification has been staged with got stage.

A corrupt or missing file index can be recreated on demand as @@ -152,7 +153,7 @@

.got
Meta-data directory where all files listed below reside.
base-commit
-
SHA1 hex-string representation of the current base commit.
+
hash digest hex-string representation of the current base commit.
file-index
File status information.
format
@@ -180,13 +181,13 @@ rename(2), stat(2), umask(2), - lockf(3), + flock(3), git-repository(5), got.conf(5)

July 11, - 2024 OpenBSD 7.5
+ line">August 14, + 2024 OpenBSD 7.6 blob - d22d7b47c66886721e929bb2af617e6c4cee32c1 blob + 0a79cf06575e50a73dae80b876db41afaa617642 --- got.1.html +++ got.1.html @@ -81,6 +81,7 @@

The commands for got are as follows:

+ [-A hashing-algorithm] [-b branch] repository-path
Create a new empty repository at the specified @@ -102,6 +103,12 @@

The options for got init are as follows:

+
+ hashing-algorithm
+
Configure the repository's hashing-algorithm + used for the computation of Git object IDs. Possible values are + sha1 (the default) or + sha256.
branch
Make the repository's HEAD reference point to the specified @@ -485,16 +492,16 @@ selected branch. If this option is not specified, the most recent commit on the selected branch will be used.

The expected commit argument is a - commit ID SHA1 hash, or a reference name or a keyword 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. The keywords ":base" and - ":head" resolve to the repository's HEAD reference, or, if - the -b option is used, the head of the - checked-out branch. Keywords and reference - names 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, + commit ID, or a reference name or a keyword which will be resolved + to a commit ID. 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 + repository's HEAD reference, or, if the -b + option is used, the head of the checked-out + branch. Keywords and reference names 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 foo:-3 will denote the 3rd generation ancestor of the commit resolved by the @@ -624,23 +631,23 @@ this option is not specified, the most recent commit on the work tree's branch will be used.

The expected commit argument is a - commit ID SHA1 hash, or a reference name or a keyword 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. The keywords ":base" and - ":head" resolve to the work tree's base commit and branch - head, respectively. Keywords and reference names may be appended - with ":+" or ":-" modifiers and an optional - integer N to denote the Nth descendant or antecedent, respectively, - by first parent traversal; 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, foo:-3 - will denote the 3rd generation ancestor of the commit resolved by - the "foo" reference. If an integer does not follow the - ":+" or ":-" modifier, a "1" is - implicitly appended (e.g., :head:- is equivalent - to :head:-1).

+ commit ID, or a reference name or a keyword which will be resolved + to a commit ID. 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. Keywords and + reference names may be appended with ":+" or + ":-" modifiers and an optional integer N to denote the Nth + descendant or antecedent, respectively, by first parent traversal; + 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, foo:-3 will denote the 3rd + generation ancestor of the commit resolved by the "foo" + reference. If an integer does not follow the ":+" or + ":-" modifier, a "1" is implicitly appended + (e.g., :head:- is equivalent to + :head:-1).

Silence progress output.
@@ -806,9 +813,9 @@ to the work tree's current branch if invoked in a work tree, or to the repository's HEAD reference.

The expected commit - argument is a commit ID SHA1 hash, or a reference name or a keyword - which will be resolved to a commit ID. An abbreviated hash argument - will be expanded to a full SHA1 hash automatically, provided the + argument is a commit ID, or a reference name or a keyword which will + be resolved to a commit ID. 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 @@ -881,7 +888,7 @@

search-pattern
If specified, show only commits with a log message, author name, - committer name, or ID SHA1 hash matched by the extended regular + committer name, or commit ID matched by the extended regular expression search-pattern. Lines in committed patches will be matched if -p is specified. File paths changed by a commit will be matched if @@ -903,9 +910,9 @@
Stop traversing commit history immediately after the specified commit has been traversed. Like -c, the expected commit - argument is a commit ID SHA1 hash, or a reference name or a keyword - which will be resolved to a commit ID. This option has no effect if - the specified commit is never traversed.
+ argument is a commit ID, or a reference name or a keyword which will + be resolved to a commit ID. This option has no effect if the specified + commit is never traversed.
@@ -921,14 +928,14 @@ 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. 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.

+ reference, a tag name, or an object ID, 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. 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:

@@ -951,9 +958,9 @@ such path arguments are provided, only show differences for the specified paths.

The expected commit - argument is a commit ID SHA1 hash, or a reference name or a keyword - which will be resolved to a commit ID. An abbreviated hash argument - will be expanded to a full SHA1 hash automatically, provided the + argument is a commit ID, or a reference name or a keyword which will + be resolved to a commit ID. 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 @@ -1013,16 +1020,16 @@

commit
Start traversing history at the specified - commit. The expected argument is a commit ID - SHA1 hash, or a reference name or a keyword 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. 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 ":-" + commit. The expected argument is a commit ID, or + a reference name or a keyword which will be resolved to a commit ID. + 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 @@ -1082,14 +1089,14 @@ commit
List files and directories as they appear in the specified commit. -

The expected argument is a commit ID SHA1 - hash, or a reference name or a keyword 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. 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, +

The expected argument is a commit ID, or a + reference name or a keyword which will be resolved to a commit ID. + 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 @@ -1137,10 +1144,10 @@ the specified name will point at the specified object.

The expected object - argument is an ID SHA1 hash or an existing reference or tag name or - a keyword which will be resolved to the ID of a corresponding - commit, tree, tag, or blob object. An abbreviated hash argument will - be expanded to a full SHA1 hash automatically, provided the + argument is an object ID or an existing reference or tag name or a + keyword which will be resolved to the ID of a corresponding commit, + tree, tag, or blob object. 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 @@ -1264,16 +1271,16 @@

commit
Make a newly created branch reference point at the specified - commit. The expected argument is a commit ID - SHA1 hash, or a reference name or keyword 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. 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 ":-" + commit. The expected argument is a commit ID, or + a reference name or keyword which will be resolved to a commit ID. 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 @@ -1358,18 +1365,18 @@ commit
Make the newly created tag reference point at the specified commit. The expected - commit argument is a commit ID SHA1 hash, or a - reference or keyword 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. 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, + commit argument is a commit ID, or a reference + or keyword which will be resolved to a commit ID. 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, @@ -1608,9 +1615,9 @@ apply cleanly may then be rejected entirely, rather than producing merge conflicts in the patched target file.

The expected commit - argument is a commit ID SHA1 hash, or a reference name or a keyword - which will be resolved to a commit ID. An abbreviated hash argument - will be expanded to a full SHA1 hash automatically, provided the + argument is a commit ID, or a reference name or a keyword which will + be resolved to a commit ID. 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. Keywords and references may be appended with @@ -1738,7 +1745,7 @@

The options for got commit are as follows:

-
+
author
Set author information in the newly created commit to author. This is useful when committing changes @@ -1941,9 +1948,9 @@ 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 commit ID SHA1 hash, - or a reference name or keyword which will be resolved to a commit ID. An - abbreviated hash argument will be expanded to a full SHA1 hash +

The expected argument is a commit ID, or a + reference name or keyword which will be resolved to a commit ID. 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. Keywords and references may be @@ -2057,9 +2064,9 @@ 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 commit ID SHA1 hash, or - a reference name or keyword which will be resolved to a commit ID. An - abbreviated hash argument will be expanded to a full SHA1 hash +

The expected argument is a commit ID, or a + reference name or keyword which will be resolved to a commit ID. 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. Keywords and references may be @@ -2368,9 +2375,9 @@ operation.

The format of the histedit script is line-based. Each line in the script begins with a command name, followed by whitespace and an - argument. For most commands, the expected argument is a commit ID SHA1 - hash. Any remaining text on the line is ignored. Lines which begin with - the ‘#’ character are ignored entirely.

+ argument. For most commands, the expected argument is a commit ID. Any + remaining text on the line is ignored. Lines which begin with the + ‘#’ character are ignored entirely.

The available histedit script commands are as follows:

@@ -2919,10 +2926,10 @@ similar to the actual content stored in such objects. Blob object contents are printed as they would appear in files on disk.

Attempt to interpret each argument as a reference, a tag name, - or an object ID SHA1 hash. References will be resolved to an object ID. - Tag names will resolved to a tag object. An abbreviated hash argument - will be expanded to a full SHA1 hash automatically, provided the - abbreviation is unique.

+ or an object ID. References will be resolved to an object ID. Tag names + will resolved to a tag object. An abbreviated hash argument will be + expanded to a full commit ID automatically, provided the abbreviation is + unique.

If none of the above interpretations produce a valid result, or if the -P option is used, attempt to interpret the argument as a path which will be resolved to the ID of an @@ -2935,14 +2942,14 @@

Look up paths in the specified commit. If this option is not used, paths are looked up in the commit resolved via the repository's HEAD reference. -

The expected argument is a commit ID SHA1 - hash, or a reference name or keyword 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. 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, +

The expected argument is a commit ID, or a + reference name or keyword which will be resolved to a commit ID. 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 @@ -3438,9 +3445,18 @@ remote "origin" {
Christian Weisgerber <naddy@openbsd.org> +
+ Florian Obser + <florian@narrans.de>
Hiltjo Posthuma <hiltjo@codemadness.org> +
+ James Cook + <falsifian@falsifian.org> +
+ Jasper Lievisse Adriaanse + <j@jasper.la>
Josh Rickmar <jrick@zettaport.com> @@ -3448,12 +3464,30 @@ remote "origin" { Joshua Stein <jcs@openbsd.org>
+ Josiah Frentsos + <jfrent@tilde.team> +
Klemens Nanni <kn@openbsd.org>
+ Kyle Ackerman + <kackerman0102@gmail.com> +
+ Lorenz (xha) + <me@xha.li> +
+ Lucas Gabriel Vuotto + <lucas@sexy.is> +
+ Mark Jamsek + <mark@jamsek.dev> +
Martin Pieuchot <mpi@openbsd.org>
+ Mikhail Pchelin + <misha@freebsd.org> +
Neels Hofmeyr <neels@hofmeyr.de>
@@ -3472,29 +3506,45 @@ remote "origin" { Steven McDonald <steven@steven-mcdonald.id.au>
+ Ted Unangst + <tedu@tedunangst.com> +
Theo Buehler <tb@openbsd.org>
Thomas Adam <thomas@xteddy.org>
+ Tobias Heider + <me@tobhe.de> +
+ Tom Jones + <thj@freebsd.org> +
Tracey Emery <tracey@traceyemery.net>
Yang Zhong <yzhong@freebsdfoundation.org>

Parts of got, - tog(1), and + tog(1), + gotd(8), and gotwebd(8) were derived from code under copyright by:


+ Bjoern Hoehrmann +
Caldera International
Daniel Hartmeier
+ David Gwynne +
Esben Norby
+ Florian Obser +
Henning Brauer
Håkan Olsson @@ -3503,6 +3553,8 @@ remote "origin" {
Jean-Francois Brousseau
+ Jerome Kasper +
Joris Vink
Jyri J. Virkki @@ -3511,14 +3563,20 @@ remote "origin" {
Markus Friedl
+ Mike Larkin +
Niall O'Higgins
Niklas Hallqvist
Ray Lai
+ Reyk Floeter +
Ryan McBride
+ Ted Unangst +
Theo de Raadt
Todd C. Miller @@ -3537,6 +3595,11 @@ remote "origin" { git(1) to perform some tasks. In particular:

    +
  • With repositories that use the sha256 object ID hashing algorithm, + git(1) is currently required + for all network operations (clone, fetch, and push) because + got does not yet support version 2 of the Git + network protocol.
  • Writing to remote repositories over HTTP or HTTPS protocols requires git-push(1).
  • The creation of merge commits with more than two parent commits requires @@ -3549,7 +3612,7 @@ remote "origin" {
    July 11, - 2024 OpenBSD 7.5
    + line">August 14, + 2024 OpenBSD 7.6 blob - 159c4caa20ea550daa5d294b674da6e4e43eabae blob + 0fa58670e2aaa224bc744d20d54afe8622b3cea7 --- got.conf.5.html +++ got.conf.5.html @@ -42,8 +42,13 @@ repository-wide settings for got(1) commands executed within this work tree.

    The file format is line-based, with one configuration directive - per line. Any lines beginning with a ‘#’ are treated as - comments and ignored.

    + per line. Comments can be put anywhere in the file using a hash mark + (‘#’), and extend to the end of the current line. Arguments + names not beginning with a letter, digit or underscore, as well as reserved + words (such as author, + remote or + port), must be quoted. Arguments containing + whitespace should be surrounded by double quotes (").

    The available configuration directives are as follows:

    @@ -320,7 +325,7 @@
    July 11, - 2024 OpenBSD 7.5
    + line">August 14, + 2024 OpenBSD 7.6 blob - 6be5c4775583e647af61903fabeff9a412f84ba3 blob + d19b0b1fa9363a73ca04e1f89daac9ee6183589b --- gotadmin.1.html +++ gotadmin.1.html @@ -68,6 +68,7 @@ follows:

    + [-A hashing-algorithm] [-b branch] repository-path
    Create a new empty repository at the specified @@ -89,6 +90,12 @@

    The options for gotadmin init are as follows:

    +
    + hashing-algorithm
    +
    Configure the repository's hashing-algorithm + used for the computation of Git object IDs. Possible values are + sha1 (the default) or + sha256.
    branch
    Make the repository's HEAD reference point to the specified @@ -102,9 +109,9 @@ [-r repository-path]
    Display information about a repository. This includes some configuration settings from got.conf(5), and the number of objects stored in the repository, in - packed or loose form, as well as the current on-disk size of these - objects. + 5">got.conf(5), the object ID hashing algorithm, and the number of + objects stored in the repository, in packed or loose form, as well as the + current on-disk size of these objects.

    The options for gotadmin info are as follows:

    @@ -436,7 +443,7 @@
    July 11, - 2024 OpenBSD 7.5
    + line">August 14, + 2024 OpenBSD 7.6 blob - d1b4282bccc355c677c776a497a2a7bc46d71870 blob + 299cb470f66fcfa85ab79428dfded30a51e23b32 --- gotctl.8.html +++ gotctl.8.html @@ -86,7 +86,7 @@
    July 11, - 2024 OpenBSD 7.5
    + line">August 14, + 2024 OpenBSD 7.6 blob - b8a17e1a6b9ea91e01e65eae2d47e825fbc176df blob + 00ac07931cfd6e6f0ac567d23b85704c67564316 --- gotd.8.html +++ gotd.8.html @@ -126,9 +126,16 @@

    Stefan Sperling <stsp@openbsd.org>

    +
    +

    +

    At present, gotd cannot serve repositories + that use the sha256 object ID hashing algorithm because + gotd does not yet support version 2 of the Git + network protocol.

    +
    July 11, - 2024 OpenBSD 7.5
    + line">August 14, + 2024 OpenBSD 7.6 blob - 660c7d4d20710a90bd60e13597c907b7a0040e29 blob + 54a84d085d90ab56faf623ce1243c92c888ef5c2 --- gotd.conf.5.html +++ gotd.conf.5.html @@ -37,8 +37,13 @@

    gotd.conf is the run-time configuration file for gotd(8).

    The file format is line-based, with one configuration directive - per line. Any lines beginning with a ‘#’ are treated as - comments and ignored.

    + per line. Comments can be put anywhere in the file using a hash mark + (‘#’), and extend to the end of the current line. Arguments + names not beginning with a letter, digit or underscore, as well as reserved + words (such as listen, + repository or + user), must be quoted. Arguments containing + whitespace should be surrounded by double quotes (").

    gotd(8) drops privileges to the specified user. If not specified, the user _gotd - will be used.

    + will be used. Numeric user IDs are also accepted.
@@ -474,7 +479,7 @@ connection {
July 11, - 2024 OpenBSD 7.5
+ line">August 14, + 2024OpenBSD 7.6 blob - cf37dd61dbe68e8ab12c00d2414189c6e165c23e blob + d8be79134153495c16b4f68121a60f4a9a8c60fa --- gotsh.1.html +++ gotsh.1.html @@ -157,7 +157,7 @@
July 11, - 2024 OpenBSD 7.5
+ line">August 14, + 2024OpenBSD 7.6 blob - d2605f8aaac25a7b68b23d396df84779a3de251a blob + ce821ea610009f53d0563fada6bc0547abefe814 --- gotwebd.8.html +++ gotwebd.8.html @@ -191,7 +191,7 @@ server "example.com" {
July 11, - 2024 OpenBSD 7.5
+ line">August 14, + 2024OpenBSD 7.6 blob - e08c9947c6c05d51a11f085a893c41946b1cf4a3 blob + 632578648df57a231351bf6f968d1d59055d1069 --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -37,8 +37,13 @@

gotwebd.conf is the run-time configuration file for gotwebd(8).

The file format is line-based, with one configuration directive - per line. Any lines beginning with a ‘#’ are treated as - comments and ignored.

+ per line. Comments can be put anywhere in the file using a hash mark + (‘#’), and extend to the end of the current line. Arguments + names not beginning with a letter, digit or underscore, as well as reserved + words (such as listen, + serveror + user), must be quoted. Arguments containing + whitespace should be surrounded by double quotes (").

Macros can be defined that are later expanded in context. Macro names must start with a letter, digit, or underscore, and may contain any of those characters, but may not be reserved words. Macros are not expanded @@ -158,16 +163,17 @@ listen on $lan_addr port 9090 updated with an appropriate description.

on | off
-
Set whether to display the repository owner. Enabled by default. - Displaying the owner requires owner information to be added to the - config file in the repository. - gotwebd(8) will parse - owner information from either a [gotweb] or a [gitweb] section. For - example: +
Set whether to display the repository owner. Enabled by default. This + requires the creation of an owner file in the + repository or adding an ‘owner’ field under the [gotweb] or + [gitweb] section in the config file inside the + repository. For example: 
[gotweb]
 owner = "Your Name"
+

The owner file has priority over the + config if present.

@@ -236,7 +242,7 @@ server "localhost" {
July 11, - 2024 OpenBSD 7.5
+ line">August 14, + 2024OpenBSD 7.6 blob - 395d1c936bc0a81628dc590d71e8d6f802666f81 blob + fd6a14dfc48b642b524a64a19c5546ef6667ea62 --- tog.1.html +++ tog.1.html @@ -202,7 +202,15 @@
Like g but defaults to the oldest commit.
Open a diff view showing file changes made in - the currently selected commit.
+ the currently selected commit. If a commit is marked with the + m key map, open a diff view showing file + changes made between the marked commit and the currently selected + commit. +
+
Mark or unmark the selected commit. When a commit is marked, pressing + the enter key on another selected commit opens + a diff view showing the changes between the + marked commit and the currently selected commit.
Open a tree view showing the tree for the currently selected commit.
@@ -215,7 +223,7 @@
Prompt for a search pattern and start searching for matching commits. The search pattern is an extended regular expression which is matched against a commit's author name, committer name, log message, and - commit ID SHA1 hash. Regular expression syntax is documented in + commit ID. Regular expression syntax is documented in re_format(7).
Prompt for a pattern and limit the log view's list of commits to those @@ -227,9 +235,9 @@ with / will search the limited list of commits, rather than searching all commits. The pattern is an extended regular expression which is matched against a commit's author name, - committer name, log message, and commit ID SHA1 hash. Regular - expression syntax is documented in - re_format(7).
+ committer name, log message, and commit ID. Regular expression syntax + is documented in re_format(7).
Find the Nth next commit which matches the current search pattern (default: 1). @@ -270,16 +278,16 @@
commit
Start traversing history at the specified - commit. The expected argument is a commit ID - SHA1 hash, or a reference name or keyword 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. 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 ":-" + commit. The expected argument is a commit ID, or + a reference name or keyword which will be resolved to a commit ID. 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 @@ -306,10 +314,10 @@ 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 SHA1 hash, - 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 SHA1 hash + 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 @@ -497,16 +505,16 @@
commit
Start traversing history at the specified - commit. The expected argument is a commit ID - SHA1 hash, or a reference name or keyword 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. 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 ":-" + commit. The expected argument is a commit ID, or + a reference name or keyword which will be resolved to a commit ID. 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 @@ -622,16 +630,16 @@
commit
Start traversing history at the specified - commit. The expected argument is a commit ID - SHA1 hash, or a reference name or keyword 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. 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 ":-" + commit. The expected argument is a commit ID, or + a reference name or keyword which will be resolved to a commit ID. 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 @@ -697,7 +705,7 @@
Show object IDs for all non-symbolic references displayed in the ref view.
-
+
Show last modified date of each displayed reference.
Toggle display order of references between sort by name and sort by @@ -847,7 +855,7 @@
July 11, - 2024 OpenBSD 7.5
+ line">August 14, + 2024 OpenBSD 7.6