.\" .\" Copyright (c) 2017 Martin Pieuchot .\" Copyright (c) 2018, 2019 Stefan Sperling .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above .\" copyright notice and this permission notice appear in all copies. .\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd $Mdocdate$ .Dt GOT 1 .Os .Sh NAME .Nm got .Nd version control system .Sh SYNOPSIS .Nm .Ar command .Op Fl h .Op Ar arg ... .Sh DESCRIPTION .Nm is a version control system which prioritizes ease of use and simplicity over flexibility. .Pp .Nm stores the history of tracked files in a repository which uses the same on-disk format as .Dq bare repositories used by the Git version control system. This repository format is described in .Xr git-repository 5 . .Pp .Nm is a .Em distributed version control system because every copy of a repository is writeable. Modifications made to files can be synchronized between repositories at any time. .Pp Files managed by .Nm must be checked out from the repository for modification. Checked out files are stored in a .Em work tree which can be placed at an arbitrary directory in the filesystem hierarchy. The on-disk format of a .Nm work tree is described in .Xr got-worktree 5 . .Pp .Nm provides global and command-specific options. Global options must preceed the command name, and are as follows: .Bl -tag -width tenletters .It Fl h Display usage information. .El .Pp The commands for .Nm are as follows: .Bl -tag -width checkout .It Cm checkout [ Fl c Ar commit ] [ Fl p Ar path-prefix ] repository-path [ work-tree-path ] Copy files from a repository into a new work tree. If the .Ar work tree path is not specified, either use the last component of .Ar repository path , or if a .Ar path prefix was specified use the last component of .Ar path prefix . .Pp The options for .Cm got checkout are as follows: .Bl -tag -width Ds .It Fl c Ar commit Check out files from the specified .Ar commit . If this option is not specified, a commit resolved via the repository's HEAD reference will be used. .It Fl p Ar path-prefix Restrict the work tree to a subset of the repository's tree hierarchy. Only files beneath the specified .Ar path-prefix will be checked out. .El .It Cm update [ Fl c Ar commit ] [ work-tree-path ] Update an existing work tree to another commit on the current branch. By default, the latest commit on the current branch is assumed. Show the status of each affected file, using the following status codes: .Bl -column YXZ description .It U Ta file was updated and contained no local changes .It G Ta file was updated and local changes were merged cleanly .It C Ta file was updated and conflicts occurred during merge .It D Ta file was deleted .It A Ta new file was added .It ~ Ta versioned file is obstructed by a non-regular file .It ! Ta a missing versioned file was restored .El .Pp If the .Ar work tree path is omitted, use the current working directory. .Pp .Pp The options for .Cm got update are as follows: .Bl -tag -width Ds .It Fl c Ar commit Update the work tree to the specified .Ar commit . The expected argument is a SHA1 hash which corresponds to a commit object. .El .It Cm status [ Ar path ] Show the current modification status of files in a worktree, using the following status codes: .Bl -column YXZ description .It M Ta modified file .It ! Ta versioned file was expected on disk but is missing .It ~ Ta versioned file is obstructed by a non-regular file .It ? Ta unversioned item not tracked by .Nm .El .Pp If a .Ar path is specified, only show modifications within this path. .It Cm log [ Fl c Ar commit ] [ Fl C Ar number ] [ Fl f ] [ Fl l Ar N ] [ Fl p ] [ Fl r Ar repository-path ] [ path ] Display history of a repository. If a .Ar path is specified, show only commits which modified this path. .Pp The options for .Cm got log are as follows: .Bl -tag -width Ds .It Fl c Ar commit Start traversing history at the specified .Ar commit . The expected argument is the name of a branch or a SHA1 hash which corresponds to a commit object. .It Fl C Ar number Set the number of context lines shown in diffs with .Fl p . By default, 3 lines of context are shown. .It Fl f Restrict history traversal to the first parent of each commit. This shows the linear history of the current branch only. Merge commits which affected the current branch will be shown but individual commits which originated on other branches will be omitted. .It Fl l Ar N Limit history traversal to a given number of commits. .It Fl p Display the patch of modifications made in each commit. .It Fl r Ar 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 .Nm work tree, use the repository path associated with this work tree. .El .It Cm diff [ Fl C Ar number ] [ Fl r Ar repository-path ] [ Ar object1 Ar object2 | Ar path ] When invoked within a work tree with less than two arguments, display uncommitted changes in the work tree. If a .Ar path is specified, only show changes within this path. .Pp If two arguments are provided, treat each argument as a SHA1 hash which corresponds to an object in the repository, and display differences between these objects. Both objects must be of the same type (blobs, trees, or commits). .Pp The options for .Cm got diff are as follows: .Bl -tag -width Ds .It Fl C Ar number Set the number of context lines shown in the diff. By default, 3 lines of context are shown. .It Fl r Ar 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 .Nm work tree, use the repository path associated with this work tree. .El .It Cm blame [ Fl c Ar commit ] [ Fl r Ar repository-path ] Ar path Display line-by-line history of a file at the specified path. .Pp The options for .Cm got blame are as follows: .Bl -tag -width Ds .It Fl c Ar commit Start traversing history at the specified .Ar commit . The expected argument is the name of a branch or a SHA1 hash which corresponds to a commit object. .It Fl r Ar 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 .Nm work tree, use the repository path associated with this work tree. .El .It Cm tree [ Fl c Ar commit ] [ Fl r Ar repository-path ] [ Fl i ] [ Fl R] [ Ar path ] Display a listing of files and directories at the specified directory path in the repository. Entries shown in this listing may carry one of the following trailing annotations: .Bl -column YXZ description .It / Ta entry is a directory .It * Ta entry is an executable file .El .Pp If no .Ar path is specified, list the repository path corresponding to the current directory of the work tree, or the root directory of the repository if there is no work tree. .Pp The options for .Cm got tree are as follows: .Bl -tag -width Ds .It Fl c Ar commit List files and directories as they appear in the specified .Ar commit . The expected argument is the name of a branch or a SHA1 hash which corresponds to a commit object. .It Fl r Ar 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 .Nm work tree, use the repository path associated with this work tree. .It Fl i Show object IDs of files (blob objects) and directories (tree objects). .It Fl R Recurse into sub-directories in the repository. .El .It Cm ref [ Fl r Ar repository-path ] [ Fl l ] [ Fl d Ar name ] [ Ar name Ar object ] Manage references in a repository. .Pp If no options are passed, expect two arguments and attempt to create, or update, the reference with the given .Ar name , and make it point at the given .Ar object . The object argument is a SHA1 hash which corresponds to an existing object in the repository. .Pp The options for .Cm got ref are as follows: .Bl -tag -width Ds .It Fl r Ar 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 .Nm work tree, use the repository path associated with this work tree. .It Fl l List all existing references in the repository. .It Fl d Ar name Delete the reference with the specified name from the repository. .El .El .Sh EXIT STATUS .Ex -std got .Sh EXAMPLES Check out a work tree of .Ox kernel sources from a Git repository at /var/repo/openbsd-src to ~/sys: .Pp .Dl $ got checkout -p sys /var/repo/openbsd-src ~/sys .Sh SEE ALSO .Xr git-repository 5 .Xr got-worktree 5 .Sh AUTHORS .An Stefan Sperling Aq Mt stsp@openbsd.org .An Martin Pieuchot Aq Mt mpi@openbsd.org