A Git repository stores a series of versioned snapshots of a file hierarchy. Conceptually, the repository's data model is a directed acyclic - graph which contains three types of objects as nodes:

Blobs

The content of tracked files is stored in objects of type @@ -214,7 +214,7 @@

September 18, - 2023 OpenBSD 7.3

+ line">November 29, + 2023 OpenBSD 7.4 blob - d699a36be6fffa5df80d8aa5dfab5edeca170851 blob + 15ac112a07331045b912213b898fed6fefdbdbc6 --- gitwrapper.1.html +++ gitwrapper.1.html @@ -142,7 +142,7 @@

September 18, - 2023 OpenBSD 7.3

+ line">November 29, + 2023 OpenBSD 7.4 blob - 99c3a1911beeca547ff7ac7c8de077da43a7b126 blob + c66104c2e6232e60304dbb4dbe17bc3f673778d2 --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@

September 18, - 2023 OpenBSD 7.3

+ line">November 29, + 2023 OpenBSD 7.4 blob - 863a689f632c229a03b7fd3d2f01823b4dbdce89 blob + 94b458d45b48ecb88291d697fce29d80e67ec966 --- got.1.html +++ got.1.html @@ -2345,14 +2345,8 @@ mesg - [log-message] - Create a new log message for the commit of a preceding - pick or edit command - on the previous line of the histedit script. The optional - log-message argument provides a new single-line - log message to use. If the log-message argument - is omitted, open an editor where a new log message can be - written. + commit + Open an editor to create a new log message for this commit.

Every commit in the history being edited must be mentioned in @@ -2581,30 +2575,33 @@

(alias:
       mg)

Merge the specified branch into the current branch of - the work tree. If the branches have diverged, creates a merge commit. - Otherwise, if branch already includes all commits - from the work tree's branch, updates the work tree's branch to be the same - as branch without creating a commit, and updates the - work tree to the most recent commit on the branch. -

If a linear project history is desired, then use of - got rebase should be preferred over - got merge. However, even strictly linear - projects may require merge commits in order to merge in new versions of - third-party code stored on vendor branches created with - got import.

+ the work tree. If the branches have diverged, merge changes into the work + tree and create a merge commit. Otherwise, if the specified + branch is already based on the work tree's current + branch, make the work tree's current branch equivalent to the specified + branch and update files in the work tree + accordingly.

Merge commits are commits based on multiple parent commits. - The tip commit of the work tree's current branch, which must be in the - “refs/heads/” reference namespace and must be set with - got update -b before starting the - merge operation, will be used as the first - parent. The tip commit of the specified branch - will be used as the second parent.

+ The tip commit of the work tree's current branch will be used as the + first parent. The tip commit of the specified + branch will be used as the second parent. The work + tree's current branch must be in the “refs/heads/” + reference namespace and can be set with

got update
+        -b

before starting the merge + operation.

No ancestral relationship between the two branches is required. If the two branches have already been merged previously, only new changes will be merged.

It is not possible to create merge commits with more than two parents. If more than one branch needs to be merged, then multiple merge commits with two parents each can be created in sequence.

If a linear project history is desired, then use of + got rebase should generally be preferred over + got merge. However, even strictly linear + projects may require occasional merge commits, for example in order to + merge in new versions of third-party code stored on + “vendor” branches created with got + import.

While merging changes found on the branch into the work tree, show the status of each affected file, using the following status codes:

@@ -3490,7 +3487,7 @@ remote "origin" {

September 18, - 2023 OpenBSD 7.3

+ line">November 29, + 2023 OpenBSD 7.4 blob - 9aa4dbe72113ce28ade8f223e499764b0b783de1 blob + 58cfd1e30dd75b91c48f73dbbfdfca5908ae68b7 --- got.conf.5.html +++ got.conf.5.html @@ -306,7 +306,7 @@

September 18, - 2023 OpenBSD 7.3

+ line">November 29, + 2023 OpenBSD 7.4 blob - 8a7bcb3cc91a6a0e1bf2cac36fa66d322b88129c blob + 992934f878867711650b81217e909a437af503b4 --- gotadmin.1.html +++ gotadmin.1.html @@ -262,11 +262,11 @@ as follows:

-a

Delete all loose objects. By default, objects which are newer than an - implementation-defined modification timestamp are kept on disk to - prevent race conditions with other commands that add new objects to - the repository while gotadmin cleanup is - running.

Delete all redundant loose and packed objects. By default, objects + which are newer than an implementation-defined modification timestamp + are kept on disk to prevent race conditions with other commands that + add new objects to the repository while

gotadmin
+          cleanup

is running.

-n

Display the usual progress output and summary information but do not actually remove any files from disk.

September 18, - 2023 OpenBSD 7.3

November 29, + 2023OpenBSD 7.4September 18, - 2023 OpenBSD 7.3

November 29, + 2023OpenBSD 7.4addressportnumberConfigure an address and port for incoming FCGI TCP connections. Valid - address arguments are hostnames, IP4 addresses, IPv6 - addresses, and network interface names. The port - argument may be number or a service name defined in - services(5). + address arguments are hostnames, IP4 addresses and + IPv6 addresses. The port argument may be number or a + service name defined in services(5).

May be specified multiple times to build up a list of listening sockets. However, a given combination of address and port may only be used by one server.

If a network interface name is given as - address argument then - gotwebd(8) will obtain - the list of addresses on this interface only on startup. Any future - changes to the address configuration of the interface will be - ignored.

listen on socket off

September 18, - 2023 OpenBSD 7.3

November 29, + 2023OpenBSD 7.4Determines the default diff algorithm used by tog. Supported diff algorithms are Myers (quick and dirty) and Patience (slow and tidy). Valid values for TOG_DIFF_ALGORITHM are - “patience” and “myers”. If unset, the Myers + “patience” and “myers”. If unset, the Patience diff algorithm will be used by default.

TOG_VIEW_SPLIT_MODE

Determines the default layout of split-screen views. If set to @@ -847,7 +847,7 @@

September 18, - 2023 OpenBSD 7.3

+ line">November 29, + 2023 OpenBSD 7.4

DESCRIPTION