GOT_AUTHOR will be overriden by configuration
-        settings in

got.conf(5) or by Git's +

GOT_AUTHOR will be overridden by
+        configuration settings in

got.conf(5) or by + Git's user.name and + user.email configuration settings in the + repository's .git/config file. The user.name and user.email - configuration settings in the repository's - .git/config file. The - user.name and user.email configuration settings contained in Git's global ~/.gitconfig configuration file will only be used if neither got.conf(5) nor the @@ -2045,6 +2180,11 @@

EXAMPLES

Enable tab-completion of got command names + in ksh(1):

$ set -A complete_got -- $(got -h
+  2>&1 | sed -n s/commands://p)

Clone an existing Git repository for use with got.

@@ -2165,7 +2305,8 @@ :-)

$ got backout
   unified-buffer-cache

Fetch new upstream commits into the local repository's +

Fetch new changes on the remote repository's + “master” branch, making them visible on the local repository's “origin/master” branch:

$ cd /usr/src

@@ -2204,30 +2345,9 @@ unified-buffer-cache

$ got update -c master

$ got histedit

In order to merge changes committed to the - “unified-buffer-cache” branch back into the - “master” branch, the “unified-buffer-cache” - branch must first be rebased onto the “master” branch:

$ got update -b master

$ got rebase
-  unified-buffer-cache

Changes on the “unified-buffer-cache” branch can now - be made visible on the “master” branch with - got integrate. Because the rebase operation switched - the work tree to the “unified-buffer-cache” branch, the work - tree must be switched back to the “master” branch before the - “unified-buffer-cache” branch can be integrated into - “master”:

$ got update -b master

$ got integrate
-  unified-buffer-cache

Additional steps may be necessary if local changes need to be - pushed back to the remote repository, which currently requires - git push. Before working against existing branches - in a repository cloned with git clone --bare instead - of got clone, a Git “refspec” must be +

Before working against existing branches in a repository cloned + with git clone --bare instead of + got clone, a Git “refspec” must be configured to map all references in the remote repository into the “refs/remotes” namespace of the local repository. This can be achieved by setting Git's remote.origin.fetch @@ -2257,22 +2377,47 @@

This configuration leaves the local repository's “refs/heads” namespace free for use by local branches checked out with got checkout and, if needed, created with - got branch.

Branches in the “remotes/origin” namespace can now - be updated with incoming changes from the remote repository with - got fetch or git-fetch(1) without - extra command line arguments:

+ got branch. Branches in the + “refs/remotes/origin” namespace can now be updated with + incoming changes from the remote repository with

got
+    fetch

or git-fetch(1) without extra command line + arguments. Newly fetched changes can be examined with

got
+    log

Display changes on the remote repository's version of the + “master” branch, as of the last time got + fetch was run:

$ cd /var/git/repo

$ git fetch

To make changes fetched from the remote repository appear on the - “master” branch, the “master” branch must be - rebased onto the “origin/master” branch. This will also merge - local changes, if any, with the incoming changes:

$ got log -c origin/master |
+  less

As shown here, most commands accept abbreviated reference names + such as “origin/master” instead of + “refs/remotes/origin/master”. The latter is only needed in + case of ambiguity.

got rebase must be used to merge changes + which are visible on the “origin/master” branch into the + “master” branch. This will also merge local changes, if any, + with the incoming changes:

$ got update -b
   origin/master

$ got rebase master

In order to make changes committed to the + “unified-buffer-cache” visible on the “master” + branch, the “unified-buffer-cache” branch must first be + rebased onto the “master” branch:

$ got update -b master

$ got rebase
+  unified-buffer-cache

Changes on the “unified-buffer-cache” branch can now + be made visible on the “master” branch with + got integrate. Because the rebase operation switched + the work tree to the “unified-buffer-cache” branch the work + tree must be switched back to the “master” branch first:

$ got update -b master

$ got integrate
+  unified-buffer-cache

On the “master” branch, log messages for local changes can now be amended with “OK” by other developers and any other important new information:

@@ -2280,10 +2425,19 @@

$ got update -c
   origin/master

$ got histedit -m

Local changes on the “master” branch can then be - pushed to the remote repository with git push:

If the remote repository offers write access local changes on the + “master” branch can be sent to the remote repository with + got send. Usually, got send + can be run without further arguments. The arguments shown here match + defaults, provided the work tree's current branch is the + “master” branch:

$ cd /var/git/repo

$ got send -b master
+  origin

If the remote repository requires the HTTPS protocol the + git-push(1) command must be used instead:

$ cd /var/git/src.git

$ git push origin master

@@ -2316,7 +2470,7 @@

Reading from remote repositories over HTTP or HTTPS protocols requires git-clone(1) and git-fetch(1).
Writing to remote repositories, over any protocol, requires +
Writing to remote repositories over HTTP or HTTPS protocols requires git-push(1).
The creation of merge commits, i.e. commits with two or more parent commits, requires git-merge(1).

July 26, 2021

OpenBSD 6.9

August 31, 2021

OpenBSD 7.0

ls

Short alias for listpack.

cleanup - [-p] [-n] - [-r repository-path] - [-q]

-a

-p

-n

-r

repository-path

-q

Purge unreferenced loose objects from the repository and display the amount of disk space which has been freed as a result.

Unreferenced objects are present in the repository but cannot @@ -232,6 +232,12 @@

The options for gotadmin cleanup are 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.
-p: Instead of purging unreferenced loose objects, remove any pack index files which do not have a corresponding pack file.
Page-up, Ctrl+b: Move the selection cursor up one page.
Home, + g: Move the cursor to the newest commit.
End, + G: Move the cursor to the oldest commit. This will traverse all commits + on the current branch which may take a long time depending on the + number of commits in branch history. If needed this operation can be + cancelled with Backspace.
Enter, Space: Open a diff view showing file changes made in @@ -145,8 +154,9 @@ currently selected commit.
Backspace: Show log entries for the parent directory of the currently selected - path, unless an active search is in progress in which case - Backspace aborts the search.

/

Prompt for a search pattern and start searching for matching commits. The search pattern is an extended regular expression which is matched @@ -228,6 +238,12 @@

Page-up,
         Ctrl+b

Scroll up one page.

Home,
+        g

Scroll to the top of the view.

End,
+        G

Scroll to the bottom of the view.

[

Reduce the amount of diff context lines.

]