1 .\"
2 .\" Copyright (c) 2017 Martin Pieuchot
3 .\" Copyright (c) 2018, 2019 Stefan Sperling
4 .\"
5 .\" Permission to use, copy, modify, and distribute this software for any
6 .\" purpose with or without fee is hereby granted, provided that the above
7 .\" copyright notice and this permission notice appear in all copies.
8 .\"
9 .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 .\"
17 .Dd $Mdocdate$
18 .Dt GOT 1
19 .Os
20 .Sh NAME
21 .Nm got
22 .Nd version control system
23 .Sh SYNOPSIS
24 .Nm
25 .Ar command
26 .Op Fl h
27 .Op Ar arg ...
28 .Sh DESCRIPTION
29 .Nm
30 is a version control system which prioritizes ease of use and simplicity
31 over flexibility.
32 .Pp
33 .Nm
34 stores the history of tracked files in a repository which uses
35 the same on-disk format as
36 .Dq bare
37 repositories used by the Git version control system.
38 This repository format is described in
39 .Xr git-repository 5 .
40 .Pp
41 .Nm
42 is a
43 .Em distributed
44 version control system because every copy of a repository is writeable.
45 Modifications made to files can be synchronized between repositories
46 at any time.
47 .Pp
48 Files managed by
49 .Nm
50 must be checked out from the repository for modification.
51 Checked out files are stored in a
52 .Em work tree
53 which can be placed at an arbitrary directory in the filesystem hierarchy.
54 The on-disk format of a
55 .Nm
56 work tree is described in
57 .Xr got-worktree 5 .
58 .Pp
59 .Nm
60 provides global and command-specific options.
61 Global options must preceed the command name, and are as follows:
62 .Bl -tag -width tenletters
63 .It Fl h
64 Display usage information.
65 .El
66 .Pp
67 The commands for
68 .Nm
69 are as follows:
70 .Bl -tag -width checkout
71 .It Cm checkout [ Fl c Ar commit ] [ Fl p Ar path-prefix ] repository-path [ work-tree-path ]
72 Copy files from a repository into a new work tree.
73 If the
74 .Ar work tree path
75 is not specified, either use the last component of
76 .Ar repository path ,
77 or if a
78 .Ar path prefix
79 was specified use the last component of
80 .Ar path prefix .
81 .Pp
82 The options for
83 .Cm got checkout
84 are as follows:
85 .Bl -tag -width Ds
86 .It Fl c Ar commit
87 Check out files from the specified
88 .Ar commit .
89 If this option is not specified, a commit resolved via the repository's HEAD
90 reference will be used.
91 .It Fl p Ar path-prefix
92 Restrict the work tree to a subset of the repository's tree hierarchy.
93 Only files beneath the specified
94 .Ar path-prefix
95 will be checked out.
96 .El
97 .It Cm update [ Fl c Ar commit ] [ work-tree-path ]
98 Update an existing work tree to another commit on the current branch.
99 By default, the latest commit on the current branch is assumed.
100 Show the status of each affected file, using the following status codes:
101 .Bl -column YXZ description
102 .It U Ta file was updated and contained no local changes
103 .It G Ta file was updated and local changes were merged cleanly
104 .It C Ta file was updated and conflicts occurred during merge
105 .It D Ta file was deleted
106 .It A Ta new file was added
107 .It ~ Ta versioned file is obstructed by a non-regular file
108 .It ! Ta a missing versioned file was restored
109 .El
110 .Pp
111 If the
112 .Ar work tree path
113 is omitted, use the current working directory.
114 .Pp
115 .Pp
116 The options for
117 .Cm got update
118 are as follows:
119 .Bl -tag -width Ds
120 .It Fl c Ar commit
121 Update the work tree to the specified
122 .Ar commit .
123 The expected argument is a SHA1 hash which corresponds to a commit object.
124 .El
125 .It Cm status [ Ar worktree-path ]
126 Show the current modification status of files in a worktree,
127 using the following status codes:
128 .Bl -column YXZ description
129 .It M Ta modified file
130 .It ! Ta versioned file was expected on disk but is missing
131 .It ~ Ta versioned file is obstructed by a non-regular file
132 .It ? Ta unversioned item not tracked by
133 .Nm
134 .El
135 .Pp
136 If the
137 .Ar work tree path
138 is omitted, use the current working directory.
139 .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 ]
140 Display history of a repository.
141 If a
142 .Ar path
143 is specified, show only commits which modified this path.
144 .Pp
145 The options for
146 .Cm got log
147 are as follows:
148 .Bl -tag -width Ds
149 .It Fl c Ar commit
150 Start traversing history at the specified
151 .Ar commit .
152 The expected argument is the name of a branch or a SHA1 hash which corresponds
153 to a commit object.
154 .It Fl C Ar number
155 Set the number of context lines shown in diffs with
156 .Fl p .
157 By default, 3 lines of context are shown.
158 .It Fl f
159 Restrict history traversal to the first parent of each commit.
160 This shows the linear history of the current branch only.
161 Merge commits which affected the current branch will be shown but
162 individual commits which originated on other branches will be omitted.
163 .It Fl l Ar N
164 Limit history traversal to a given number of commits.
165 .It Fl p
166 Display the patch of modifications made in each commit.
167 .It Fl r Ar repository-path
168 Use the repository at the specified path.
169 If not specified, assume the repository is located at or above the current
170 working directory.
171 If this directory is a
172 .Nm
173 work tree, use the repository path associated with this work tree.
174 .El
175 .It Cm diff [ Fl C Ar number ] [ Fl r Ar repository-path ] [ Ar object1 Ar object2 ]
176 Display differences between blobs in the repository and files in the
177 work tree, or between two specified objects in a repository.
178 If specified, each
179 .Ar object
180 argument is a SHA1 hash which corresponds to the object.
181 Both objects must be of the same type (blobs, trees, or commits).
182 .Pp
183 The options for
184 .Cm got diff
185 are as follows:
186 .Bl -tag -width Ds
187 .It Fl C Ar number
188 Set the number of context lines shown in the diff.
189 By default, 3 lines of context are shown.
190 .It Fl r Ar repository-path
191 Use the repository at the specified path.
192 If not specified, assume the repository is located at or above the current
193 working directory.
194 If this directory is a
195 .Nm
196 work tree, use the repository path associated with this work tree.
197 .El
198 .It Cm blame [ Fl c Ar commit ] [ Fl r Ar repository-path ] Ar path
199 Display line-by-line history of a file at the specified path.
200 .Pp
201 The options for
202 .Cm got blame
203 are as follows:
204 .Bl -tag -width Ds
205 .It Fl c Ar commit
206 Start traversing history at the specified
207 .Ar commit .
208 The expected argument is the name of a branch or a SHA1 hash which corresponds
209 to a commit object.
210 .It Fl r Ar repository-path
211 Use the repository at the specified path.
212 If not specified, assume the repository is located at or above the current
213 working directory.
214 If this directory is a
215 .Nm
216 work tree, use the repository path associated with this work tree.
217 .El
218 .It Cm tree [ Fl c Ar commit ] [ Fl r Ar repository-path ] [ Fl i ] [ Fl R] [ Ar path ]
219 Display a listing of files and directories at the specified
220 directory path in the repository.
221 Entries shown in this listing may carry one of the following trailing
222 annotations:
223 .Bl -column YXZ description
224 .It / Ta entry is a directory
225 .It * Ta entry is an executable file
226 .El
227 .Pp
228 If no
229 .Ar path
230 is specified, list the repository path corresponding to the current
231 directory of the work tree, or the root directory of the repository
232 if there is no work tree.
233 .Pp
234 The options for
235 .Cm got tree
236 are as follows:
237 .Bl -tag -width Ds
238 .It Fl c Ar commit
239 List files and directories as they appear in the specified
240 .Ar commit .
241 The expected argument is the name of a branch or a SHA1 hash which corresponds
242 to a commit object.
243 .It Fl r Ar repository-path
244 Use the repository at the specified path.
245 If not specified, assume the repository is located at or above the current
246 working directory.
247 If this directory is a
248 .Nm
249 work tree, use the repository path associated with this work tree.
250 .It Fl i
251 Show object IDs of files (blob objects) and directories (tree objects).
252 .It Fl R
253 Recurse into sub-directories in the repository.
254 .El
255 .Sh EXIT STATUS
256 .Ex -std got
257 .Sh EXAMPLES
258 Check out a work tree of
259 .Ox
260 kernel sources from a Git repository at /var/repo/openbsd-src to ~/sys:
261 .Pp
262 .Dl $ got checkout -p sys /var/repo/openbsd-src ~/sys
263 .Sh SEE ALSO
264 .Xr git-repository 5
265 .Xr got-worktree 5
266 .Sh AUTHORS
267 .An Stefan Sperling Aq Mt stsp@openbsd.org
268 .An Martin Pieuchot Aq Mt mpi@openbsd.org