commit 1b792db00ee03acca221b5c3a1add5b1258563b3 from: Stefan Sperling date: Sun Dec 13 14:38:44 2020 UTC sync man pages commit - c98d46d0cf6e0024a77fc19f8f46e010198197e3 commit + 1b792db00ee03acca221b5c3a1add5b1258563b3 blob - 7f595a9998a7b400a1114b1cc25a3aeebadbb4fa blob + 17f0cf2db991b60cb2806b295bdc10bb08da6aa8 --- git-repository.5.html +++ git-repository.5.html @@ -217,7 +217,7 @@ - +

November 14, 2020

December 13, 2020

OpenBSD 6.8

blob - 900d72bf22b7705eeb08891a7e56da2ddea0d527 blob + a5970eaa61e3f1ec46fc560fb60aaa0bfb8b2277 --- got-worktree.5.html +++ got-worktree.5.html @@ -191,7 +191,7 @@ - +

November 14, 2020

December 13, 2020

OpenBSD 6.8

blob - c38d39c6c5bff4414373e44c6588769b751dc94e blob + bfba3e32c029c65c09b14df08c04bcb3ce3d000c --- got.1.html +++ got.1.html @@ -726,11 +726,11 @@

diff - [-C number] - [-r repository-path] - [-s] [-w] - [object1 object2 | - path]

+ [-a] [-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. @@ -743,6 +743,9 @@

The options for got diff are as follows:

-a

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

-C number

Set the number of context lines shown in the diff. By default, 3 lines @@ -1420,7 +1423,7 @@

The options for got rebase are as follows:

-a

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

-c

Short alias for rebase.

histedit [-a] [-c] - [-F histedit-script] - [-m]

-f-Fhistedit-script-mEdit 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 @@ -1450,8 +1453,7 @@

Editing of commit history is controlled via a histedit script which can be written in an editor based on a template, passed on the command line, or generated with the - -m option if only log messages need to be - edited.

+ -f or -m options.

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 @@ -1558,12 +1560,18 @@

The options for got histedit are as follows:

-a

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

-c

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

-f

Fold all commits into a single commit. This option is a quick + equivalent to a histedit script which folds all commits, combining + 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.

-F histedit-script

Use the specified histedit-script instead of @@ -2171,7 +2179,7 @@ - +

November 14, 2020

December 13, 2020

OpenBSD 6.8

blob - cfa0106ce0c8d5bc1200efa7f879126761464c41 blob + 8de9abf1a8f166541dfd8cccd54e50a7ec095477 --- gotweb.8.html +++ gotweb.8.html @@ -73,10 +73,8 @@ 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 @@ -124,7 +122,6 @@

Example configuration for httpd.conf:

-
   types { include "/usr/share/misc/mime.types" }
   server "gotweb.example.com" {
   	listen on * port 80
@@ -136,8 +133,7 @@
   	location "/*" {
   		directory index "index.html"
   	}
-  }
-

+ }

@@ -158,7 +154,7 @@ - +

November 14, 2020

December 13, 2020

OpenBSD 6.8

blob - c9b506357c9dd2f6322d525b381090793df218f5 blob + a8a6343b318821e9e12246688b372bde3e1c9ae1 --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -100,10 +100,8 @@ 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"

got_site_link @@ -129,7 +127,6 @@ owner = "Your Name" gotweb(8) with their default values. - # # gotweb options # all paths relative to /var/www (httpd chroot jail) @@ -154,8 +151,7 @@ got_logo_url "https://gameoftrees.org" #got_show_repo_owner off #got_show_repo_age false #got_show_repo_description no -#got_show_repo_cloneurl off - +#got_show_repo_cloneurl off @@ -174,7 +170,7 @@ got_logo_url "https://gameoftrees.org" - + November 14, 2020 December 13, 2020 OpenBSD 6.8 blob - dc8f7703a716c347c15e61486c7e81beab314095 blob + 9f387be0da7631e1bed628fd0cc7d38094b1bbd6 --- tog.1.html +++ tog.1.html @@ -80,6 +80,8 @@ Displays the line-by-line history of a file. Tree view Displays the tree corresponding to a particular commit. + Ref view + Displays references in the repository.

tog provides global and command-specific key bindings and options. The global key bindings are:

@@ -159,11 +161,16 @@ Searching continues until either a match is found or the Backspace key is pressed.

Ctrl+l

Reload the log view with new commits found in the repository.

Reload the log view with new commits found in + the repository.

B

Reload the log view and toggle display of merged commits. The - -b option determines whether merged commits - are displayed initially.

Reload the log view and toggle display of + merged commits. The -b option determines + whether merged commits are displayed initially.

r

Open a ref view listing all references in the + repository. This can then be used to open a new + log view for arbitrary branches and tags.

The options for tog log are as follows:

@@ -183,7 +190,7 @@ is unique. If this option is not specified, default to the work tree's current branch if invoked in a work tree, or to the repository's HEAD reference.

-r +

-r repository-path

Use the repository at the specified path. If not specified, assume the repository is located at or above the current working directory. If @@ -192,16 +199,22 @@

diff - [-r repository-path] - object1 object2

Display the differences between two objects in the repository. Each - object argument is an object ID SHA1 hash. An + [-a] [-C + number] [-r + repository-path] [-w] + object1 object2 +

Display the differences between two objects in the repository. Treat each + of the two arguments 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. Both objects must be - of the same type (blobs, trees, or commits). + automatically, provided the abbreviation is unique.

The key bindings for tog diff are as follows:

a: Toggle treatment of file contents as ASCII text even if binary data + was detected.
Down-arrow, j: Scroll down.; Increase the amount of diff context lines.
<, Comma: If the diff view was opened via the log view, move to the previous - (younger) commit.; If the diff view was opened via the + log view, move to the previous (younger) + commit.
>, Full stop: If the diff view was opened via the log view, move to the next (older) - commit.; If the diff view was opened via the + log view, move to the next (older) + commit.
/: Prompt for a search pattern and start searching for matching lines. The search pattern is an extended regular expression. Regular @@ -235,16 +250,27 @@; Find the next line which matches the current search pattern.
N: Find the previous line which matches the current search pattern.
w: Toggle display of whitespace-only changes.

The options for tog diff are as follows:

-r +
-a: Treat file contents as ASCII text even if binary data is + detected.
-C + number: Set the number of context lines shown in the diff. By default, 3 lines + of context are shown.
-r repository-path: Use the repository at the specified path. If not specified, assume the 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.
-w: Ignore whitespace-only changes.

blame @@ -300,7 +326,7 @@ branch or a commit ID SHA1 hash. An abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the abbreviation is unique. -

-r +

-r repository-path

Use the repository at the specified path. If not specified, assume the repository is located at or above the current working directory. If @@ -358,6 +384,11 @@

l

Open a log view for the currently selected tree entry.

r

Open a ref view listing all references in the + repository. This can then be used to open a new + tree view for arbitrary branches and + tags.

Backspace

Move back to the parent directory.

i

@@ -385,7 +416,60 @@ branch or a commit ID SHA1 hash. An abbreviated hash argument will be expanded to a full SHA1 hash automatically, provided the abbreviation is unique. -

-r +

-r + repository-path

Use the repository at the specified path. If not specified, assume the + 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.

+ + +

ref + [-r repository-path]

Display references in the repository. +

The key bindings for tog ref are as + follows:

Down-arrow, + j: Move the selection cursor down.
Up-arrow, + k: Move the selection cursor up.
Page-down, + Ctrl+f: Move the selection cursor down one page.
Page-up, + Ctrl+b: Move the selection cursor up one page.
Enter: Open a log view which begins traversing + history at the commit resolved via the currently selected + reference.
t: Open a tree view showing the tree resolved via + the currently selected reference.
i: Show object IDs for all non-symbolic references displayed in the + ref view.
/: Prompt for a search pattern and start searching for matching + references. The search pattern is an extended regular expression which + is matched against absolute reference names. Regular expression syntax + is documented in re_format(7).
n: Find the next reference which matches the current search pattern.
N: Find the previous reference which matches the current search + pattern.
Ctrl+l: Reload the list of references displayed by the + ref view.

The options for tog ref are as + follows:

-r repository-path: Use the repository at the specified path. If not specified, assume the repository is located at or above the current working directory. If @@ -439,6 +523,18 @@
TOG_COLOR_DATE: The color used to mark up date information. If not set, the default value “yellow” is used.
TOG_COLOR_REFS_HEADS: The color used to mark up references in the “refs/heads/” + namespace. If not set, the default value “green” is + used.
TOG_COLOR_REFS_TAGS: The color used to mark up references in the “refs/tags/” + namespace. If not set, the default value “magenta” is + used.
TOG_COLOR_REFS_REMOTES: The color used to mark up references in the “refs/remotes/” + namespace. If not set, the default value “yellow” is + used.

@@ -464,7 +560,7 @@ - +

November 14, 2020

December 13, 2020

OpenBSD 6.8