commit 461d9094e8d058d6276d41305a7575a0a01bfc3e from: Stefan Sperling date: Wed Jul 19 14:17:44 2023 UTC sync man pages commit - e4a79cad8dfb580418fc196503baf714f2fe12f8 commit + 461d9094e8d058d6276d41305a7575a0a01bfc3e blob - bd50835d18f682e633d6c7ce501ef60173299b56 blob + 5e75d273aad07eee93d005dc742347f3c31cd173 --- git-repository.5.html +++ git-repository.5.html @@ -214,7 +214,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - 6f543586d86863a3d61c9c4ee8c80e21930538c7 blob + 08e2e3a332dcfb1c79061dec71230aa94190e15a --- gitwrapper.1.html +++ gitwrapper.1.html @@ -142,7 +142,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - 82fa9fe4e80023c45c460b8314d7b5a35f4b0fe3 blob + 6071c6dc6fa95ce97459e7db018c6c520c7b72ca --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - d75d3ef41ad1b440db0637ed00d9cc850edc0854 blob + 8275943f5604e103f6495b02c2da3c81831702db --- got.1.html +++ got.1.html @@ -116,7 +116,8 @@

Use the specified log message when creating the new commit. Without the -m option,

got
           import

opens a temporary file in an editor where a log message - can be written.

+ can be written. Quitting the editor without saving the file will abort + the import operation.

-r repository-path

Use the repository at the specified path. If not specified, assume the @@ -213,12 +214,12 @@ “refs/heads/” reference namespace, rather than to branches in the “refs/remotes/” namespace. This avoids the usual requirement of having to run

got
-            rebase

after got fetch in order to - make incoming changes appear on branches in the - “refs/heads/” namespace. But maintaining custom - changes in the cloned repository becomes difficult since such - changes will be at risk of being discarded whenever incoming changes - are fetched.

+ rebase or got merge after + got fetch in order to make incoming changes + appear on branches in the “refs/heads/” namespace. But + maintaining custom changes in the cloned repository becomes + difficult since such changes will be at risk of being discarded + whenever incoming changes are fetched.

-q

Suppress progress reporting output. The same option will be passed to @@ -288,9 +289,10 @@

By default, branch references in the “refs/remotes/” reference namespace will be updated to point at the newly fetched commits. The got - rebase command can then be used to make new changes visible on - branches in the “refs/heads/” namespace, merging incoming - changes with the changes on those branches as necessary.

+ rebase or got merge command can then be + used to make new changes visible on branches in the + “refs/heads/” namespace, merging incoming changes with the + changes on those branches as necessary.

If the repository was created as a mirror with got clone -m, then all branches in the “refs/heads/” namespace will be updated directly to match @@ -426,12 +428,26 @@

-c commit

Check out files from the specified commit on the - selected branch. 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 this option is - not specified, the most recent commit on the selected branch will be - used. + 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, + :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 + "foo" reference. If an integer does not follow the + ":+" or ":-" modifier, a "1" is + implicitly appended (e.g., :head:- is equivalent + to :head:-1).

If the specified commit is not contained in the selected branch, a different branch which contains this commit must be specified with the -b @@ -550,13 +566,28 @@

-c commit

Update the work tree to the specified commit. - 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 this option is - not specified, the most recent commit on the work tree's branch will - be used.

Update the work tree to the specified commit. If + 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).

-q

Silence progress output.

@@ -713,13 +744,32 @@

-c commit

Start traversing history at the specified - commit. 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 - 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.

+ commit. 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. +

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. 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, + respectively, by first parent traversal; for example, + :head:-2 denotes the HEAD reference's 2nd + generation ancestor, and :base:+4 denotes the 4th + generation descendant of the work tree's base commit. Similarly, + bar:+3 + will denote the 3rd generation descendant of the commit resolved by + the "bar" reference. A ":+" or ":-" + modifier without a trailing integer has an implicit "1" + appended (e.g., :base:+ is equivalent to + :base:+1).

-d

Display diffstat of changes introduced in each commit. Cannot be used with the -s option.

@@ -828,14 +878,32 @@ 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.

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. 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, + respectively, by first parent traversal; for example, + :head:-2 denotes the HEAD reference's 2nd + generation ancestor, and :base:+4 denotes the 4th + generation descendant of the work tree's base commit. Similarly, + baz:+8 + will denote the 8th generation descendant of the commit resolved by + the "baz" reference. If an integer does not follow the + ":+" or ":-" modifier, a "1" is + implicitly appended (e.g., :head:- is equivalent + to :head:-1).

Cannot be used together with the -P option.

@@ -878,10 +946,26 @@ commit

Start traversing history at the specified commit. 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.

+ 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 ":-" + 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, + xyz:-5 + will denote the 5th generation ancestor of the commit resolved by the + "xyz" reference. A ":+" or ":-" modifier + without a trailing integer has an implicit "1" appended + (e.g., :base:+ is equivalent to + :base:+1).

-r repository-path

Use the repository at the specified path. If not specified, assume the @@ -929,11 +1013,30 @@

-c commit

List files and directories as they appear in the specified - commit. 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.

+ 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 + ":-" 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, + spam:-3 + will denote the 3rd generation ancestor of the commit resolved by + the "spam" reference. A ":+" or ":-" + modifier without a trailing integer has an implicit "1" + appended (e.g., :base:+ is equivalent to + :base:+1).

-i

Show object IDs of files (blob objects) and directories (tree objects).

@@ -964,12 +1067,32 @@ object

Create a reference or change an existing reference. The reference with the specified name will point at the specified - object. The expected - object argument is a ID SHA1 hash or an existing - reference or tag name which will be resolved to the ID of a - corresponding commit, tree, tag, or blob object. Cannot be used - together with any other options except - -r.

+ 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 + 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 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 + tagged:-3 + will denote the 3rd generation ancestor of the commit resolved by + the "tagged" reference. If an integer does not follow the + ":+" or ":-" modifier, a "1" is + implicitly appended (e.g., :head:- is equivalent + to :head:-1).

Cannot be used together with any other options except + -r.

-d

Delete the reference with the specified name from the repository. Any commit, tree, tag, and blob objects belonging @@ -1073,10 +1196,27 @@

-c commit

Make a newly created branch reference point at the specified - commit. The expected - commit argument is a commit ID SHA1 hash or an - existing reference or tag name which will be resolved to a commit - ID.

+ 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 ":-" + 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).

-d name

Delete the branch with the specified name from @@ -1092,7 +1232,7 @@ remote repositories' branches in the “refs/remotes/” reference namespace.

If invoked in a work tree, the work tree's current branch - is shown with one the following annotations:

+ is shown with one of the following annotations:

@@ -1148,10 +1288,27 @@ commit

Make the newly created tag reference point at the specified commit. The expected - commit 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.

+ 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, + :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, + eggs:-3 + will denote the 3rd generation ancestor of the commit resolved by the + "eggs" reference. A ":+" or ":-" + modifier without a trailing integer has an implicit "1" + appended (e.g., :base:+ is equivalent to + :base:+1).

-l

List all existing tags in the repository instead of creating a new tag. If a name argument is passed, show only the @@ -1161,7 +1318,8 @@

Use the specified tag message when creating the new tag. Without the -m option, got tag opens a temporary file in an editor where a tag message can be - written.

+ written. Quitting the editor without saving the file will abort the + tag operation.

-r repository-path

Use the repository at the specified path. If not specified, assume the @@ -1361,12 +1519,6 @@ commit

Attempt to locate files within the specified commit for use as a merge-base for 3-way merges. - Ideally, the specified commit should contain - versions of files which the changes contained in the - patchfile were based on. Files will be located - by path, relative to the repository root. If the - -p option is used then leading path components - will be stripped before paths are looked up in the repository.

If the -c option is not used then got patch will attempt to locate merge-bases via object IDs found in patchfile meta-data, @@ -1374,10 +1526,36 @@ git-diff(1). Use of the -c option is only recommended in the absence of such meta-data.

Ideally, the specified commit should + contain versions of files which the changes contained in the + patchfile were based on. Files will be located + by path, relative to the repository root. If the + -p option is used then leading path + components will be stripped before paths are looked up in the + repository.

In case no merge-base is available for a file, changes will be applied without doing a 3-way merge. Changes which do not 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 + 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 + ":+" 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, + flan:+3 + will denote the 3rd generation descendant of the commit resolved by + the "flan" reference. A ":+" or ":-" + modifier without a trailing integer has an implicit "1" + appended (e.g., :base:+ is equivalent to + :base:+1).

-n

Do not make any modifications to the work tree. This can be used to @@ -1451,7 +1629,8 @@ an editor where a log message can be written unless the -m option is used or the -F and -N options are - used together.

+ used together. Quitting the editor without saving the file will abort + the commit operation.

Show the status of each affected file, using the following status codes:

@@ -1615,10 +1794,11 @@

-f

Attempt to force the server to overwrite existing branches or tags in - the remote repository, even when got fetch and - got rebase would usually be required before - changes can be sent. The server may reject forced requests regardless, - depending on its configuration. + the remote repository, even when got fetch + followed by got rebase or

got
+          merge

would usually be required before changes can be sent. The + server may reject forced requests regardless, depending on its + configuration.

Any commit, tree, tag, and blob objects belonging to overwritten branches or tags may become subject to deletion by Git's garbage collector running on the server.

@@ -1634,8 +1814,9 @@ out-of-date copy of a branch in the remote repository. Instead of using the -f option, new changes should be fetched with got fetch and local branches - should be rebased with got rebase, followed - by another attempt to send the changes.

+ should be rebased with got rebase or merged + with got merge, followed by another attempt + to send the changes.

The -f option should only be needed in situations where the remote repository's copy of a branch or tag is known to be out-of-date and is considered disposable. The @@ -1689,9 +1870,25 @@ 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 expanded to a - full SHA1 hash automatically, provided the abbreviation is unique. + 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 + 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 ":+" 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, + barbaz:+3 + will denote the 3rd generation descendant of the commit resolved by the + "barbaz" reference. A ":+" or ":-" + modifier without a trailing integer has an implicit "1" + appended (e.g., :base:+ is equivalent to + :base:+1).

Show the status of each affected file, using the following status codes:

@@ -1789,10 +1986,25 @@ 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 - expanded to a full SHA1 hash automatically, provided the abbreviation is - unique. + 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 + 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 ":+" 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, + wip:+5 will + denote the 5th generation descendant of the commit resolved by the + "wip" reference. A ":+" or ":-" modifier + without a trailing integer has an implicit "1" appended (e.g., + :base:+ is equivalent to + :base:+1).

Show the status of each affected file, using the following status codes:

@@ -2011,7 +2223,8 @@ -c option.

-c

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

+ other command-line arguments are allowed except + -C.

-l

Show a list of past rebase operations, represented by references in the “refs/got/backup/rebase” reference namespace. @@ -2080,7 +2293,9 @@ histedit script which can be written in an editor based on a template, passed on the command line, or generated with the -d, -e, - -f, or -m options.

+ -f, or -m options. + Quitting the editor without saving the file will abort the histedit + 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 @@ -2233,7 +2448,8 @@ with the -c option.

-c

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

+ other command-line arguments are allowed except + -C.

-d

Drop all commits. This option is a quick equivalent to a histedit script which drops all commits. The -d option @@ -2354,7 +2570,7 @@ reverted with got revert.

merge - [-aCcn] [branch]

+ [-aCcMn] [branch]

(alias:
       mg)

@@ -2466,7 +2682,10 @@ -c option.

-c

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

+ other command-line arguments are allowed except + -C. +

-M

Create a merge commit even if the branches have not diverged.

-n

Merge changes into the work tree as usual but do not create a merge commit immediately. The merge result can be adjusted as desired before @@ -2559,12 +2778,13 @@ can be staged (however, this does not prevent the file from becoming out-of-date at some point after having been staged).

The got update, got - rebase, and got histedit commands will - refuse to run while staged changes exist. If staged changes cannot be - committed because a staged path is out of date, the path must be - unstaged with got unstage before it can be - updated with got update, and may then be staged - again if necessary.

+ rebase, got merge, and + got histedit commands will refuse to run while + staged changes exist. If staged changes cannot be committed because a + staged path is out of date, the path must be unstaged with + got unstage before it can be updated with + got update, and may then be staged again if + necessary.

unstage [-p] [-F @@ -2647,10 +2867,30 @@ commit

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 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.

+ 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, + 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, + quux:-8 + will denote the 8th generation ancestor of the commit resolved by + the "quux" reference. A ":+" or ":-" + modifier without a trailing integer has an implicit "1" + appended (e.g., :base:+ is equivalent to + :base:+1).

-P

Interpret all arguments as paths only. This option can be used to resolve ambiguity in cases where paths look like tag names, reference @@ -2686,8 +2926,8 @@ Hacker <flan_hacker@openbsd.org>”. Used by the got commit,

got
-      import

, got rebase, and - got histedit commands. Because + import, got rebase,

got
+      merge

, and got histedit commands. Because git(1) may fail to parse commits without an email address in author data, got attempts to reject @@ -3244,7 +3484,7 @@ remote "origin" {

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - 18f5799c47715bf0500bcd0d513d0e0e7575dee2 blob + 867c14ae25405d5ebc9bf533cd09c1960ccae489 --- got.conf.5.html +++ got.conf.5.html @@ -306,7 +306,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - e8c2feee46a573054f6eff617563bdcd04a53a91 blob + f8800727e150ab3c2814676b096e8ade0e09ca58 --- gotadmin.1.html +++ gotadmin.1.html @@ -285,6 +285,79 @@ work tree.

dump + [-q] [-r + repository-path] [-x + reference] [reference ...]

Dump the contents of the repository to standard output in Git bundle + format. +

If one or more reference arguments is + specified, only add objects which are reachable via the specified + references. Each reference argument may either + specify a specific reference or a reference namespace, in which case all + references within this namespace will be used.

The options for gotadmin + dump are as follows:

-q: Suppress progress reporting output.
-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.
-x + reference: Exclude objects reachable via the specified + reference from the bundle. The + reference argument may either specify a specific + reference or a reference namespace, in which case all references + within this namespace will be excluded. The -x + option may be specified multiple times to build a list of references + to exclude. +
Exclusion takes precedence over inclusion. If a reference + appears in both the included and excluded lists, it will be + excluded.
+

load + [-nq] [-l + bundle-path] [-r + repository-path] [reference + ...]

Read a Git bundle stream from standard input and load its data into a + repository. +

If one or more reference arguments are + provided then only load the specified references from the bundle. + Otherwise, all references will be loaded.

The options for gotadmin load are as + follows:

-l + bundle-path: List references available for loading from the bundle at the specified + bundle-path and exit immediately. If the + -l option is specified then no + reference arguments are allowed. The + -l option is incompatible with the + -n option.
-n: Attempt to load the bundle but don't install new packfile or update + any reference. Can be used to verify the integrity of the bundle.
-q: Suppress progress reporting output.
-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.

@@ -351,7 +424,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - 386bcae5223b2c4e38cdd35073dd99fe79fe0959 blob + 18dff53036e5f4204a3e7375b7b27ce180a405f8 --- gotctl.8.html +++ gotctl.8.html @@ -86,7 +86,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - 30ea1b068c76d54e664ee5678f7ead409cd91e8f blob + c418e6541a573c2184fbf60e7bcf765f947dbd83 --- gotd.8.html +++ gotd.8.html @@ -99,7 +99,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - a645cfc8de6c6b8eb9b060ef8e0d2667ed010f29 blob + 1ade4255b184333997e498ec2c3122c645e9d681 --- gotd.conf.5.html +++ gotd.conf.5.html @@ -265,7 +265,7 @@ connection {

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - e29c65e8b8e2442fbac4f47da912dde7a603221a blob + c8e411e4e7baba8677fe33e4f160ad192026c5d6 --- gotsh.1.html +++ gotsh.1.html @@ -157,7 +157,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - ca0b468af6bd8a398dc898a3aad3d0c5d272e86e blob + 9147cbfe858dac841aaed05191542eeda383efe9 --- gotwebd.8.html +++ gotwebd.8.html @@ -185,7 +185,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - 5024fa55df74189c4bfe7106bab969a59ac4b963 blob + 83129d6cecd4180faf66f997a15a4909abeeaab1 --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -248,7 +248,7 @@ server "localhost-unix" {

June 23, + line">July 19, 2023 OpenBSD 7.3

blob - bd1e3d21966e0f24888c4a18072d964f75abe455 blob + 558c1e2e02380fe50f40487af87da93f21cd7af9 --- tog.1.html +++ tog.1.html @@ -256,12 +256,27 @@

-c commit

Start traversing history at the specified - commit. The expected argument is the name of a - 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. 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.

+ 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 ":-" + 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).

-r repository-path

Use the repository at the specified path. If not specified, assume the @@ -277,11 +292,26 @@ 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, 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 + 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 - automatically, provided the abbreviation is unique. + 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):

-c commit: Start traversing history at the specified - commit. The expected argument is the name of a - 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 repository-path

Use the repository at the specified path. If not specified, assume the @@ -561,10 +608,27 @@

-c commit

+ 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 ":-" + 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).

-r repository-path

Use the repository at the specified path. If not specified, assume the @@ -769,7 +833,7 @@

June 23, + line">July 19, 2023 OpenBSD 7.3