2 5c860e29 2018-03-12 stsp .\" Copyright (c) 2017 Martin Pieuchot
3 5aa81393 2020-01-06 stsp .\" Copyright (c) 2018, 2019, 2020 Stefan Sperling
5 5c860e29 2018-03-12 stsp .\" Permission to use, copy, modify, and distribute this software for any
6 5c860e29 2018-03-12 stsp .\" purpose with or without fee is hereby granted, provided that the above
7 5c860e29 2018-03-12 stsp .\" copyright notice and this permission notice appear in all copies.
9 5c860e29 2018-03-12 stsp .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 5c860e29 2018-03-12 stsp .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 5c860e29 2018-03-12 stsp .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 5c860e29 2018-03-12 stsp .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 5c860e29 2018-03-12 stsp .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 5c860e29 2018-03-12 stsp .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 5c860e29 2018-03-12 stsp .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 5c860e29 2018-03-12 stsp .Dd $Mdocdate$
22 8e13c46f 2019-08-05 stsp .Nd Game of Trees
23 5c860e29 2018-03-12 stsp .Sh SYNOPSIS
27 5c860e29 2018-03-12 stsp .Op Ar arg ...
28 5c860e29 2018-03-12 stsp .Sh DESCRIPTION
30 4dfb2f0f 2019-03-26 stsp is a version control system which stores the history of tracked files
31 4dfb2f0f 2019-03-26 stsp in a Git repository, as used by the Git version control system.
32 285dc8a4 2018-03-13 stsp This repository format is described in
33 5e5560e1 2018-08-01 stsp .Xr git-repository 5 .
37 ae73e26f 2019-03-26 stsp .Dq distributed
38 4129c201 2018-03-13 stsp version control system because every copy of a repository is writeable.
39 4129c201 2018-03-13 stsp Modifications made to files can be synchronized between repositories
40 97925469 2018-03-17 stsp at any time.
42 285dc8a4 2018-03-13 stsp Files managed by
44 4129c201 2018-03-13 stsp must be checked out from the repository for modification.
45 285dc8a4 2018-03-13 stsp Checked out files are stored in a
46 285dc8a4 2018-03-13 stsp .Em work tree
47 c5867b47 2018-03-13 stsp which can be placed at an arbitrary directory in the filesystem hierarchy.
48 fb2921d0 2019-03-26 stsp The on-disk format of this work tree is described in
49 285dc8a4 2018-03-13 stsp .Xr got-worktree 5 .
52 285dc8a4 2018-03-13 stsp provides global and command-specific options.
53 bc3056e3 2019-08-18 stsp Global options must precede the command name, and are as follows:
54 1b6b95a8 2018-03-12 stsp .Bl -tag -width tenletters
56 fef8a0d3 2019-08-04 stsp Display usage information and exit immediately.
57 83cd27f8 2020-01-13 stsp .It Fl V, -version
58 53ccebc2 2019-07-30 stsp Display program version and exit immediately.
61 38e11793 2018-06-13 stsp The commands for
63 38e11793 2018-06-13 stsp are as follows:
64 0bb8a95e 2018-03-12 stsp .Bl -tag -width checkout
65 09ea71ba 2019-07-27 stsp .It Cm init Ar repository-path
66 2c7829a4 2019-06-17 stsp Create a new empty repository at the specified
67 09ea71ba 2019-07-27 stsp .Ar repository-path .
70 3ce1b845 2019-07-15 stsp .Cm got init ,
72 3ce1b845 2019-07-15 stsp .Cm got import
73 3ce1b845 2019-07-15 stsp command must be used to populate the empty repository before
74 3ce1b845 2019-07-15 stsp .Cm got checkout
75 3ce1b845 2019-07-15 stsp can be used.
76 dfc23429 2019-08-11 stsp .It Cm import Oo Fl b Ar branch Oc Oo Fl m Ar message Oc Oo Fl r Ar repository-path Oc Oo Fl I Ar pattern Oc Ar directory
77 3ce1b845 2019-07-15 stsp Create an initial commit in a repository from the file hierarchy
78 3ce1b845 2019-07-15 stsp within the specified
79 3ce1b845 2019-07-15 stsp .Ar directory .
80 3ce1b845 2019-07-15 stsp The created commit will not have any parent commits, i.e. it will be a
81 3ce1b845 2019-07-15 stsp root commit.
82 3ce1b845 2019-07-15 stsp Also create a new reference which provides a branch name for the newly
83 3ce1b845 2019-07-15 stsp created commit.
84 21a44f98 2019-07-15 stsp Show the path of each imported file to indicate progress.
87 21a44f98 2019-07-15 stsp .Cm got import
88 21a44f98 2019-07-15 stsp command requires the
89 21a44f98 2019-07-15 stsp .Ev GOT_AUTHOR
90 aba9c984 2019-09-08 stsp environment variable to be set,
91 257add31 2020-09-09 stsp unless an author has been configured in
92 257add31 2020-09-09 stsp .Xr got.conf 5
94 aba9c984 2019-09-08 stsp .Dv user.name
96 709ae9eb 2019-09-08 stsp .Dv user.email
97 709ae9eb 2019-09-08 stsp configuration settings can be obtained from the repository's
98 aba9c984 2019-09-08 stsp .Pa .git/config
99 c9956ddf 2019-09-08 stsp file or from Git's global
100 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
101 c9956ddf 2019-09-08 stsp configuration file.
103 3ce1b845 2019-07-15 stsp The options for
104 3ce1b845 2019-07-15 stsp .Cm got import
105 3ce1b845 2019-07-15 stsp are as follows:
106 3ce1b845 2019-07-15 stsp .Bl -tag -width Ds
107 3ce1b845 2019-07-15 stsp .It Fl b Ar branch
108 3ce1b845 2019-07-15 stsp Create the specified
110 3ce1b845 2019-07-15 stsp instead of creating the default branch
112 3ce1b845 2019-07-15 stsp Use of this option is required if the
114 3ce1b845 2019-07-15 stsp branch already exists.
115 3ce1b845 2019-07-15 stsp .It Fl m Ar message
116 3ce1b845 2019-07-15 stsp Use the specified log message when creating the new commit.
117 3ce1b845 2019-07-15 stsp Without the
120 3ce1b845 2019-07-15 stsp .Cm got import
121 3ce1b845 2019-07-15 stsp opens a temporary file in an editor where a log message can be written.
122 3ce1b845 2019-07-15 stsp .It Fl r Ar repository-path
123 3ce1b845 2019-07-15 stsp Use the repository at the specified path.
124 3ce1b845 2019-07-15 stsp If not specified, assume the repository is located at or above the current
125 3ce1b845 2019-07-15 stsp working directory.
126 3ce1b845 2019-07-15 stsp .It Fl I Ar pattern
127 3ce1b845 2019-07-15 stsp Ignore files or directories with a name which matches the specified
128 3ce1b845 2019-07-15 stsp .Ar pattern .
129 3ce1b845 2019-07-15 stsp This option may be specified multiple times to build a list of ignore patterns.
131 3ce1b845 2019-07-15 stsp .Ar pattern
132 3ce1b845 2019-07-15 stsp follows the globbing rules documented in
133 3ce1b845 2019-07-15 stsp .Xr glob 7 .
136 bc26cce8 2019-08-04 stsp Short alias for
137 bc26cce8 2019-08-04 stsp .Cm import .
138 0e4002ca 2020-03-21 stsp .It Cm clone Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl l Oc Oo Fl m Oc Oo Fl q Oc Oo Fl v Oc Oo Fl R Ar reference Oc Ar repository-URL Op Ar directory
139 2ab43947 2020-03-18 stsp Clone a Git repository at the specified
140 2ab43947 2020-03-18 stsp .Ar repository-URL
141 2ab43947 2020-03-18 stsp into the specified
142 3493b628 2020-03-20 stsp .Ar directory .
144 3493b628 2020-03-20 stsp .Ar directory
145 2ab43947 2020-03-18 stsp is specified the directory name will be derived from the name of the
146 2ab43947 2020-03-18 stsp cloned repository.
147 2ab43947 2020-03-18 stsp .Cm got clone
148 2ab43947 2020-03-18 stsp will refuse to run if the
149 3493b628 2020-03-20 stsp .Ar directory
150 2ab43947 2020-03-18 stsp already exists.
153 2ab43947 2020-03-18 stsp .Ar repository-URL
154 619eb6dd 2020-03-20 stsp specifies a protocol scheme, a server hostname, an optional port number
155 619eb6dd 2020-03-20 stsp separated from the hostname by a colon, and a path to the repository on
156 619eb6dd 2020-03-20 stsp the server:
157 619eb6dd 2020-03-20 stsp .Lk scheme://hostname:port/path/to/repository
159 2ab43947 2020-03-18 stsp The following protocol schemes are supported:
160 2ab43947 2020-03-18 stsp .Bl -tag -width git+ssh
162 2ab43947 2020-03-18 stsp The Git protocol as implemented by the
163 2ab43947 2020-03-18 stsp .Xr git-daemon 1
165 10c073e7 2020-03-20 stsp Use of this protocol is discouraged since it supports neither authentication
166 10c073e7 2020-03-20 stsp nor encryption.
167 2ab43947 2020-03-18 stsp .It git+ssh
168 2ab43947 2020-03-18 stsp The Git protocol wrapped in an authenticated and encrypted
171 2ab43947 2020-03-18 stsp With this protocol the hostname may contain an embedded username for
174 2ab43947 2020-03-18 stsp .Mt user@hostname
176 2ab43947 2020-03-18 stsp Short alias for git+ssh.
179 89c3c67b 2020-03-20 stsp Objects in the cloned repository are stored in a pack file which is downloaded
180 89c3c67b 2020-03-20 stsp from the server.
181 89c3c67b 2020-03-20 stsp This pack file will then be indexed to facilitate access to the objects stored
183 89c3c67b 2020-03-20 stsp If any objects in the pack file are stored in deltified form, all deltas will
184 89c3c67b 2020-03-20 stsp be fully resolved in order to compute the ID of such objects.
185 89c3c67b 2020-03-20 stsp This can take some time.
186 010f7279 2020-03-20 stsp More details about the pack file format are documented in
187 010f7279 2020-03-20 stsp .Xr git-repository 5 .
189 7848a0e1 2020-03-19 stsp .Cm got clone
190 7848a0e1 2020-03-19 stsp creates a remote repository entry in the
191 257add31 2020-09-09 stsp .Xr got.conf 5
194 257add31 2020-09-09 stsp files of the cloned repository to store the
195 7848a0e1 2020-03-19 stsp .Ar repository-url
198 132af4a5 2021-01-05 stsp arguments for future use by
199 7848a0e1 2020-03-19 stsp .Cm got fetch
201 7848a0e1 2020-03-19 stsp .Xr git-fetch 1 .
203 2ab43947 2020-03-18 stsp The options for
204 2ab43947 2020-03-18 stsp .Cm got clone
205 2ab43947 2020-03-18 stsp are as follows:
206 2ab43947 2020-03-18 stsp .Bl -tag -width Ds
208 1d4b192f 2020-03-21 stsp Fetch all branches from the remote repository's
209 1d4b192f 2020-03-21 stsp .Dq refs/heads/
210 5aa20203 2021-01-05 stsp reference namespace and set
211 5aa20203 2021-01-05 stsp .Cm fetch-all-branches
212 5aa20203 2021-01-05 stsp in the cloned repository's
213 5aa20203 2021-01-05 stsp .Xr got.conf 5
214 5aa20203 2021-01-05 stsp file for future use by
215 5aa20203 2021-01-05 stsp .Cm got fetch .
216 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
217 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
218 4ba14133 2020-03-20 stsp Cannot be used together with the
221 4ba14133 2020-03-20 stsp .It Fl b Ar branch
222 4ba14133 2020-03-20 stsp Fetch the specified
224 1d4b192f 2020-03-21 stsp from the remote repository's
225 1d4b192f 2020-03-21 stsp .Dq refs/heads/
226 1d4b192f 2020-03-21 stsp reference namespace.
227 4ba14133 2020-03-20 stsp This option may be specified multiple times to build a list of branches
229 4ba14133 2020-03-20 stsp If the branch corresponding to the remote repository's HEAD reference is not
230 4ba14133 2020-03-20 stsp in this list, the cloned repository's HEAD reference will be set to the first
231 4ba14133 2020-03-20 stsp branch which was fetched.
232 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
233 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
234 4ba14133 2020-03-20 stsp Cannot be used together with the
238 a18cccf9 2020-03-21 stsp List branches and tags available for fetching from the remote repository
239 41b0de12 2020-03-21 stsp and exit immediately.
240 41b0de12 2020-03-21 stsp Cannot be used together with any of the other options except
243 469dd726 2020-03-20 stsp Create the cloned repository as a mirror of the original repository.
244 469dd726 2020-03-20 stsp This is useful if the cloned repository will not be used to store
245 bd81cfb7 2020-04-19 stsp locally created commits.
247 469dd726 2020-03-20 stsp The repository's
248 257add31 2020-09-09 stsp .Xr got.conf 5
251 257add31 2020-09-09 stsp files will be set up with the
253 469dd726 2020-03-20 stsp option enabled, such that
254 469dd726 2020-03-20 stsp .Cm got fetch
256 469dd726 2020-03-20 stsp .Xr git-fetch 1
257 bd81cfb7 2020-04-19 stsp will write incoming changes directly to branches in the
258 469dd726 2020-03-20 stsp .Dq refs/heads/
259 469dd726 2020-03-20 stsp reference namespace, rather than to branches in the
260 469dd726 2020-03-20 stsp .Dq refs/remotes/
262 469dd726 2020-03-20 stsp This avoids the usual requirement of having to run
263 469dd726 2020-03-20 stsp .Cm got rebase
265 469dd726 2020-03-20 stsp .Cm got fetch
266 bd81cfb7 2020-04-19 stsp in order to make incoming changes appear on branches in the
267 bd81cfb7 2020-04-19 stsp .Dq refs/heads/
269 bd81cfb7 2020-04-19 stsp But maintaining custom changes in the cloned repository becomes difficult
270 bd81cfb7 2020-04-19 stsp since such changes will be at risk of being discarded whenever incoming
271 498ef124 2020-03-21 stsp changes are fetched.
273 2ab43947 2020-03-18 stsp Suppress progress reporting output.
274 2ab43947 2020-03-18 stsp The same option will be passed to
276 2ab43947 2020-03-18 stsp if applicable.
278 2690194b 2020-03-21 stsp Verbose mode.
280 2690194b 2020-03-21 stsp .Cm got clone
281 2690194b 2020-03-21 stsp to print debugging messages to standard error output.
282 2690194b 2020-03-21 stsp This option will be passed to
284 2ab43947 2020-03-18 stsp if applicable.
285 2ab43947 2020-03-18 stsp Multiple -v options increase the verbosity.
286 2ab43947 2020-03-18 stsp The maximum is 3.
287 0e4002ca 2020-03-21 stsp .It Fl R Ar reference
288 0e4002ca 2020-03-21 stsp In addition to the branches and tags that will be fetched, fetch an arbitrary
289 0e4002ca 2020-03-21 stsp .Ar reference
290 0e4002ca 2020-03-21 stsp from the remote repository's
293 0e4002ca 2020-03-21 stsp This option may be specified multiple times to build a list of additional
294 0e4002ca 2020-03-21 stsp references to fetch.
295 71f12362 2020-03-21 stsp The specified
296 71f12362 2020-03-21 stsp .Ar reference
297 a18cccf9 2020-03-21 stsp may either be a path to a specific reference, or a reference namespace
298 71f12362 2020-03-21 stsp which will cause all references in this namespace to be fetched.
300 71f12362 2020-03-21 stsp Each reference will be mapped into the cloned repository's
301 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
302 0e4002ca 2020-03-21 stsp namespace, unless the
304 0e4002ca 2020-03-21 stsp option is used to mirror references directly into the cloned repository's
308 0e4002ca 2020-03-21 stsp .Cm got clone
309 0e4002ca 2020-03-21 stsp will refuse to fetch references from the remote repository's
310 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
312 0e4002ca 2020-03-21 stsp .Dq refs/got/
316 267fe567 2020-03-18 stsp Short alias for
317 267fe567 2020-03-18 stsp .Cm clone .
318 4d482d9d 2020-03-21 stsp .It Cm fetch Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl d Oc Oo Fl l Oc Oo Fl r Ar repository-path Oc Oo Fl t Oc Oo Fl q Oc Oo Fl v Oc Oo Fl R Ar reference Oc Op Ar remote-repository
319 7848a0e1 2020-03-19 stsp Fetch new changes from a remote repository.
321 4ba14133 2020-03-20 stsp .Ar remote-repository
322 4ba14133 2020-03-20 stsp is specified,
324 7848a0e1 2020-03-19 stsp will be used.
325 50b0790e 2020-09-11 stsp The remote repository's URL is obtained from the corresponding entry in
326 257add31 2020-09-09 stsp .Xr got.conf 5
329 f8ab0c60 2020-03-20 stsp file of the local repository, as created by
330 7848a0e1 2020-03-19 stsp .Cm got clone .
332 89c3c67b 2020-03-20 stsp New changes will be stored in a separate pack file downloaded from the server.
333 89c3c67b 2020-03-20 stsp Optionally, separate pack files stored in the repository can be combined with
334 89c3c67b 2020-03-20 stsp .Xr git-repack 1 .
336 498ef124 2020-03-21 stsp By default, branch references in the
337 7848a0e1 2020-03-19 stsp .Dq refs/remotes/
338 498ef124 2020-03-21 stsp reference namespace will be updated to point at the newly fetched commits.
340 498ef124 2020-03-21 stsp .Cm got rebase
341 bd81cfb7 2020-04-19 stsp command can then be used to make new changes visible on branches in the
342 7848a0e1 2020-03-19 stsp .Dq refs/heads/
343 bd81cfb7 2020-04-19 stsp namespace, merging incoming changes with the changes on those branches
344 bd81cfb7 2020-04-19 stsp as necessary.
346 498ef124 2020-03-21 stsp If the repository was created as a mirror with
347 498ef124 2020-03-21 stsp .Cm got clone -m
348 498ef124 2020-03-21 stsp then all branches in the
349 469dd726 2020-03-20 stsp .Dq refs/heads/
350 498ef124 2020-03-21 stsp namespace will be updated directly to match the corresponding branches in
351 498ef124 2020-03-21 stsp the remote repository.
352 175367bd 2020-03-20 stsp If those branches contained local commits, these commits will no longer be
353 175367bd 2020-03-20 stsp reachable via a reference and will therefore be at risk of being discarded
354 175367bd 2020-03-20 stsp by Git's garbage collector.
355 bd81cfb7 2020-04-19 stsp Maintaining custom changes in a mirror repository is therefore discouraged.
357 db6d8ad8 2020-03-21 stsp In any case, references in the
358 7848a0e1 2020-03-19 stsp .Dq refs/tags/
359 db6d8ad8 2020-03-21 stsp namespace will always be fetched and mapped directly to local references
360 db6d8ad8 2020-03-21 stsp in the same namespace.
362 7848a0e1 2020-03-19 stsp The options for
363 7848a0e1 2020-03-19 stsp .Cm got fetch
364 7848a0e1 2020-03-19 stsp are as follows:
365 7848a0e1 2020-03-19 stsp .Bl -tag -width Ds
367 1d4b192f 2020-03-21 stsp Fetch all branches from the remote repository's
368 1d4b192f 2020-03-21 stsp .Dq refs/heads/
369 1d4b192f 2020-03-21 stsp reference namespace.
370 0c8b29c5 2021-01-05 stsp This option can be enabled by default for specific repositories in
371 0c8b29c5 2021-01-05 stsp .Xr got.conf 5 .
372 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
373 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
374 4ba14133 2020-03-20 stsp Cannot be used together with the
377 4ba14133 2020-03-20 stsp .It Fl b Ar branch
378 4ba14133 2020-03-20 stsp Fetch the specified
380 1d4b192f 2020-03-21 stsp from the remote repository's
381 1d4b192f 2020-03-21 stsp .Dq refs/heads/
382 1d4b192f 2020-03-21 stsp reference namespace.
383 4ba14133 2020-03-20 stsp This option may be specified multiple times to build a list of branches
385 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
386 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
387 4ba14133 2020-03-20 stsp Cannot be used together with the
391 f21ec2f0 2020-03-21 stsp Delete branches and tags from the local repository which are no longer
392 f21ec2f0 2020-03-21 stsp present in the remote repository.
393 f21ec2f0 2020-03-21 stsp Only references are deleted.
394 239821eb 2020-03-21 stsp Any commit, tree, tag, and blob objects belonging to deleted branches or
395 f21ec2f0 2020-03-21 stsp tags remain in the repository and may be removed separately with
396 f21ec2f0 2020-03-21 stsp Git's garbage collector.
398 41b0de12 2020-03-21 stsp List branches and tags available for fetching from the remote repository
399 41b0de12 2020-03-21 stsp and exit immediately.
400 41b0de12 2020-03-21 stsp Cannot be used together with any of the other options except
406 db6d8ad8 2020-03-21 stsp Allow existing references in the
407 db6d8ad8 2020-03-21 stsp .Dq refs/tags
408 db6d8ad8 2020-03-21 stsp namespace to be updated if they have changed on the server.
409 db6d8ad8 2020-03-21 stsp If not specified, only new tag references will be created.
410 7848a0e1 2020-03-19 stsp .It Fl r Ar repository-path
411 7848a0e1 2020-03-19 stsp Use the repository at the specified path.
412 7848a0e1 2020-03-19 stsp If not specified, assume the repository is located at or above the current
413 7848a0e1 2020-03-19 stsp working directory.
414 7848a0e1 2020-03-19 stsp If this directory is a
416 7848a0e1 2020-03-19 stsp work tree, use the repository path associated with this work tree.
418 7848a0e1 2020-03-19 stsp Suppress progress reporting output.
419 7848a0e1 2020-03-19 stsp The same option will be passed to
421 7848a0e1 2020-03-19 stsp if applicable.
423 2690194b 2020-03-21 stsp Verbose mode.
425 2690194b 2020-03-21 stsp .Cm got fetch
426 2690194b 2020-03-21 stsp to print debugging messages to standard error output.
427 7848a0e1 2020-03-19 stsp The same option will be passed to
429 7848a0e1 2020-03-19 stsp if applicable.
430 7848a0e1 2020-03-19 stsp Multiple -v options increase the verbosity.
431 7848a0e1 2020-03-19 stsp The maximum is 3.
432 0e4002ca 2020-03-21 stsp .It Fl R Ar reference
433 0e4002ca 2020-03-21 stsp In addition to the branches and tags that will be fetched, fetch an arbitrary
434 0e4002ca 2020-03-21 stsp .Ar reference
435 0e4002ca 2020-03-21 stsp from the remote repository's
438 0e4002ca 2020-03-21 stsp This option may be specified multiple times to build a list of additional
439 0e4002ca 2020-03-21 stsp references to fetch.
440 71f12362 2020-03-21 stsp The specified
441 71f12362 2020-03-21 stsp .Ar reference
442 a18cccf9 2020-03-21 stsp may either be a path to a specific reference, or a reference namespace
443 71f12362 2020-03-21 stsp which will cause all references in this namespace to be fetched.
445 0e4002ca 2020-03-21 stsp Each reference will be mapped into the local repository's
446 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
447 0e4002ca 2020-03-21 stsp namespace, unless the local repository was created as a mirror with
448 a18cccf9 2020-03-21 stsp .Cm got clone -m
449 a18cccf9 2020-03-21 stsp in which case references will be mapped directly into the local repository's
453 bd81cfb7 2020-04-19 stsp Once a reference has been fetched, a branch based on it can be created with
454 0e4002ca 2020-03-21 stsp .Cm got branch
457 0e4002ca 2020-03-21 stsp .Cm got fetch
458 0e4002ca 2020-03-21 stsp will refuse to fetch references from the remote repository's
459 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
461 0e4002ca 2020-03-21 stsp .Dq refs/got/
465 7848a0e1 2020-03-19 stsp Short alias for
466 7848a0e1 2020-03-19 stsp .Cm fetch .
467 74daf7cb 2020-01-27 stsp .It Cm checkout Oo Fl E Oc Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Oo Fl p Ar path-prefix Oc Ar repository-path Op Ar work-tree-path
468 0bb8a95e 2018-03-12 stsp Copy files from a repository into a new work tree.
469 bb51a5b4 2020-01-13 stsp Show the status of each affected file, using the following status codes:
470 bb51a5b4 2020-01-13 stsp .Bl -column YXZ description
471 bb51a5b4 2020-01-13 stsp .It A Ta new file was added
472 bb51a5b4 2020-01-13 stsp .It E Ta file already exists in work tree's meta-data
476 5d7c1dab 2018-04-01 stsp .Ar work tree path
477 c844a238 2019-02-06 stsp is not specified, either use the last component of
478 5d7c1dab 2018-04-01 stsp .Ar repository path ,
480 5d7c1dab 2018-04-01 stsp .Ar path prefix
481 c844a238 2019-02-06 stsp was specified use the last component of
482 5d7c1dab 2018-04-01 stsp .Ar path prefix .
484 38e11793 2018-06-13 stsp The options for
485 38e11793 2018-06-13 stsp .Cm got checkout
486 38e11793 2018-06-13 stsp are as follows:
487 38e11793 2018-06-13 stsp .Bl -tag -width Ds
489 bb51a5b4 2020-01-13 stsp Proceed with the checkout operation even if the directory at
490 bb51a5b4 2020-01-13 stsp .Ar work-tree-path
491 bb51a5b4 2020-01-13 stsp is not empty.
492 bb51a5b4 2020-01-13 stsp Existing files will be left intact.
493 08573d5b 2019-05-14 stsp .It Fl b Ar branch
494 3c575567 2019-07-28 stsp Check out files from a commit on the specified
495 08573d5b 2019-05-14 stsp .Ar branch .
496 08573d5b 2019-05-14 stsp If this option is not specified, a branch resolved via the repository's HEAD
497 08573d5b 2019-05-14 stsp reference will be used.
498 8069f636 2019-01-12 stsp .It Fl c Ar commit
499 8069f636 2019-01-12 stsp Check out files from the specified
501 3c575567 2019-07-28 stsp on the selected branch.
502 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
503 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
504 0e1b0230 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
505 0e1b0230 2019-07-07 stsp automatically, provided the abbreviation is unique.
506 08573d5b 2019-05-14 stsp If this option is not specified, the most recent commit on the selected
507 08573d5b 2019-05-14 stsp branch will be used.
509 4b6c9460 2020-03-05 stsp If the specified
511 4b6c9460 2020-03-05 stsp is not contained in the selected branch, a different branch which contains
512 4b6c9460 2020-03-05 stsp this commit must be specified with the
515 4b6c9460 2020-03-05 stsp If no such branch is known a new branch must be created for this
516 4b6c9460 2020-03-05 stsp commit with
517 4b6c9460 2020-03-05 stsp .Cm got branch
519 4b6c9460 2020-03-05 stsp .Cm got checkout
520 4b6c9460 2020-03-05 stsp can be used.
521 4b6c9460 2020-03-05 stsp Checking out work trees with an unknown branch is intentionally not supported.
522 38e11793 2018-06-13 stsp .It Fl p Ar path-prefix
523 38e11793 2018-06-13 stsp Restrict the work tree to a subset of the repository's tree hierarchy.
524 38e11793 2018-06-13 stsp Only files beneath the specified
525 38e11793 2018-06-13 stsp .Ar path-prefix
526 38e11793 2018-06-13 stsp will be checked out.
529 97b3a7be 2019-07-09 stsp Short alias for
530 97b3a7be 2019-07-09 stsp .Cm checkout .
531 dfc23429 2019-08-11 stsp .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Op Ar path ...
532 4f331d3a 2020-04-01 stsp Update an existing work tree to a different
533 4f331d3a 2020-04-01 stsp .Ar commit .
534 4f331d3a 2020-04-01 stsp Change existing files in the work tree as necessary to match file contents
535 4f331d3a 2020-04-01 stsp of this commit.
536 4f331d3a 2020-04-01 stsp Preserve any local changes in the work tree and merge them with the
537 4f331d3a 2020-04-01 stsp incoming changes.
539 5036ab18 2020-04-18 stsp Files which already contain merge conflicts will not be updated to avoid
540 5036ab18 2020-04-18 stsp further complications.
541 5036ab18 2020-04-18 stsp Such files will be updated when
542 5036ab18 2020-04-18 stsp .Cm got update
543 5036ab18 2020-04-18 stsp is run again after merge conflicts have been resolved.
544 5036ab18 2020-04-18 stsp If the conflicting changes are no longer needed affected files can be
545 5036ab18 2020-04-18 stsp reverted with
546 5036ab18 2020-04-18 stsp .Cm got revert
547 5036ab18 2020-04-18 stsp before running
548 5036ab18 2020-04-18 stsp .Cm got update
551 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
552 7f838b36 2019-02-08 stsp .Bl -column YXZ description
553 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
554 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
555 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
556 7f838b36 2019-02-08 stsp .It D Ta file was deleted
557 7f838b36 2019-02-08 stsp .It A Ta new file was added
558 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
559 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
560 5036ab18 2020-04-18 stsp .It # Ta file was not updated because it contains merge conflicts
561 3b9f0f87 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
566 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
567 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
568 f2ea84fa 2019-07-27 stsp specified paths.
569 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
570 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
571 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
574 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
575 c4cdcb68 2019-04-03 stsp multiple base commits.
576 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
577 47ec7be7 2019-05-12 stsp .Cm got update
578 47ec7be7 2019-05-12 stsp across the entire work tree.
579 024e9686 2019-05-14 stsp Specifying a
581 024e9686 2019-05-14 stsp is incompatible with the
585 4ed9f614 2019-08-04 stsp .Cm got update
586 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
587 4ed9f614 2019-08-04 stsp If changes have been staged with
588 4ed9f614 2019-08-04 stsp .Cm got stage ,
589 bc3056e3 2019-08-18 stsp these changes must first be committed with
590 4ed9f614 2019-08-04 stsp .Cm got commit
591 4ed9f614 2019-08-04 stsp or unstaged with
592 4ed9f614 2019-08-04 stsp .Cm got unstage .
594 507dc3bb 2018-12-29 stsp The options for
595 507dc3bb 2018-12-29 stsp .Cm got update
596 507dc3bb 2018-12-29 stsp are as follows:
597 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
598 024e9686 2019-05-14 stsp .It Fl b Ar branch
599 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
601 024e9686 2019-05-14 stsp before updating the work tree.
602 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
604 4f331d3a 2020-04-01 stsp As usual, any local changes in the work tree will be preserved.
605 4f331d3a 2020-04-01 stsp This can be useful when switching to a newly created branch in order
606 4f331d3a 2020-04-01 stsp to commit existing local changes to this branch.
608 4f331d3a 2020-04-01 stsp Any local changes must be dealt with separately in order to obtain a
609 4f331d3a 2020-04-01 stsp work tree with pristine file contents corresponding exactly to the specified
610 4f331d3a 2020-04-01 stsp .Ar branch .
611 4f331d3a 2020-04-01 stsp Such changes could first be committed to a different branch with
612 4f331d3a 2020-04-01 stsp .Cm got commit ,
613 4f331d3a 2020-04-01 stsp or could be discarded with
614 4f331d3a 2020-04-01 stsp .Cm got revert .
615 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
616 507dc3bb 2018-12-29 stsp Update the work tree to the specified
617 507dc3bb 2018-12-29 stsp .Ar commit .
618 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
619 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
620 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
621 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
622 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
623 024e9686 2019-05-14 stsp branch will be used.
626 97b3a7be 2019-07-09 stsp Short alias for
627 97b3a7be 2019-07-09 stsp .Cm update .
628 081470ac 2020-08-13 stsp .It Cm status Oo Fl s Ar status-codes Oc Op Ar path ...
629 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
630 6bad629b 2019-02-04 stsp using the following status codes:
631 6bad629b 2019-02-04 stsp .Bl -column YXZ description
632 6bad629b 2019-02-04 stsp .It M Ta modified file
633 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
634 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
635 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
636 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
637 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
638 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
640 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
641 2a06fe5f 2019-08-24 stsp .It N Ta non-existent
643 2a06fe5f 2019-08-24 stsp specified on the command line
648 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
649 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
651 4ed9f614 2019-08-04 stsp If changes have been staged with
652 4ed9f614 2019-08-04 stsp .Cm got stage ,
653 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
654 4ed9f614 2019-08-04 stsp status codes:
655 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
656 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
657 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
658 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
661 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
662 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
663 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
664 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
667 081470ac 2020-08-13 stsp The options for
668 081470ac 2020-08-13 stsp .Cm got status
669 081470ac 2020-08-13 stsp are as follows:
670 081470ac 2020-08-13 stsp .Bl -tag -width Ds
671 081470ac 2020-08-13 stsp .It Fl s Ar status-codes
672 081470ac 2020-08-13 stsp Only show files with a modification status matching any of the
673 081470ac 2020-08-13 stsp single-character status codes contained in the
674 081470ac 2020-08-13 stsp .Ar status-codes
676 081470ac 2020-08-13 stsp Any combination of codes from the above list of possible status codes
677 081470ac 2020-08-13 stsp may be specified.
678 081470ac 2020-08-13 stsp For staged files, status codes displayed in either column will be matched.
681 6841da00 2019-08-08 stsp For compatibility with
684 bd8de430 2019-10-04 stsp .Xr git 1 ,
685 6841da00 2019-08-08 stsp .Cm got status
688 bd8de430 2019-10-04 stsp patterns from
689 6841da00 2019-08-08 stsp .Pa .cvsignore
691 bd8de430 2019-10-04 stsp .Pa .gitignore
692 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
693 bd8de430 2019-10-04 stsp which match these patterns.
694 bd8de430 2019-10-04 stsp As an extension to
696 bd8de430 2019-10-04 stsp matching rules,
697 bd8de430 2019-10-04 stsp .Cm got status
698 bd8de430 2019-10-04 stsp supports consecutive asterisks,
700 bd8de430 2019-10-04 stsp which will match an arbitrary amount of directories.
702 6841da00 2019-08-08 stsp .Xr cvs 1 ,
703 6841da00 2019-08-08 stsp .Cm got status
704 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
706 bd8de430 2019-10-04 stsp .Xr git 1 ,
707 bd8de430 2019-10-04 stsp .Cm got status
708 bd8de430 2019-10-04 stsp does not support negated ignore patterns prefixed with
710 bd8de430 2019-10-04 stsp and gives no special significance to the location of path component separators,
712 bd8de430 2019-10-04 stsp in a pattern.
714 97b3a7be 2019-07-09 stsp Short alias for
715 97b3a7be 2019-07-09 stsp .Cm status .
716 0208f208 2020-05-05 stsp .It Cm log Oo Fl b Oc Oo Fl c Ar commit Oc Oo Fl C Ar number Oc Oo Fl l Ar N Oc Oo Fl p Oc Oo Fl P Oc Oo Fl s Ar search-pattern Oc Oo Fl r Ar repository-path Oc Oo Fl R Oc Oo Fl x Ar commit Oc Op Ar path
717 38e11793 2018-06-13 stsp Display history of a repository.
720 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
721 dc990cbf 2020-02-22 stsp If invoked in a work tree, the
723 dc990cbf 2020-02-22 stsp is interpreted relative to the current working directory,
724 dc990cbf 2020-02-22 stsp and the work tree's path prefix is implicitly prepended.
725 dc990cbf 2020-02-22 stsp Otherwise, the path is interpreted relative to the repository root.
727 38e11793 2018-06-13 stsp The options for
728 38e11793 2018-06-13 stsp .Cm got log
729 38e11793 2018-06-13 stsp are as follows:
730 38e11793 2018-06-13 stsp .Bl -tag -width Ds
732 1137e0ae 2020-01-27 stsp Display individual commits which were merged into the current branch
733 1137e0ae 2020-01-27 stsp from other branches.
734 48c8c60d 2020-01-27 stsp By default,
735 48c8c60d 2020-01-27 stsp .Cm got log
736 48c8c60d 2020-01-27 stsp shows the linear history of the current branch only.
737 38e11793 2018-06-13 stsp .It Fl c Ar commit
738 38e11793 2018-06-13 stsp Start traversing history at the specified
739 38e11793 2018-06-13 stsp .Ar commit .
740 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
741 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
742 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
743 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
744 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
745 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
746 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
747 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
749 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
750 6238ee32 2018-06-13 stsp .It Fl l Ar N
751 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
752 b1ebc001 2019-08-13 stsp If this option is not specified, a default limit value of zero is used,
753 b1ebc001 2019-08-13 stsp which is treated as an unbounded limit.
755 b1ebc001 2019-08-13 stsp .Ev GOT_LOG_DEFAULT_LIMIT
756 b1ebc001 2019-08-13 stsp environment variable may be set to change this default value.
758 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
761 44392932 2019-08-25 stsp is specified, only show the patch of modifications at or within this path.
763 0208f208 2020-05-05 stsp Display the list of file paths changed in each commit, using the following
764 0208f208 2020-05-05 stsp status codes:
765 0208f208 2020-05-05 stsp .Bl -column YXZ description
766 0208f208 2020-05-05 stsp .It M Ta modified file
767 0208f208 2020-05-05 stsp .It D Ta file was deleted
768 0208f208 2020-05-05 stsp .It A Ta new file was added
769 0208f208 2020-05-05 stsp .It m Ta modified file modes (executable bit only)
771 c6390436 2019-11-29 kn .It Fl s Ar search-pattern
772 c6390436 2019-11-29 kn If specified, show only commits with a log message matched by the extended
773 6841bf13 2019-11-29 kn regular expression
774 6841bf13 2019-11-29 kn .Ar search-pattern .
775 0208f208 2020-05-05 stsp When used together with
777 0208f208 2020-05-05 stsp then the file paths changed by a commit can be matched as well.
778 6841bf13 2019-11-29 kn Regular expression syntax is documented in
779 6841bf13 2019-11-29 kn .Xr re_format 7 .
780 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
781 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
782 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
783 04ca23f4 2018-07-16 stsp working directory.
784 e9cf2e30 2019-02-05 stsp If this directory is a
786 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
788 dbec59df 2020-04-18 stsp Determine a set of commits to display as usual, but display these commits
789 dbec59df 2020-04-18 stsp in reverse order.
790 d1fe46f9 2020-04-18 stsp .It Fl x Ar commit
791 52ab7958 2020-04-18 stsp Stop traversing commit history as soon as the specified
793 52ab7958 2020-04-18 stsp has been traversed.
794 d1fe46f9 2020-04-18 stsp This option has no effect if the specified
796 d1fe46f9 2020-04-18 stsp is never traversed.
798 64453f7e 2020-11-21 stsp .It Cm diff Oo Fl a Oc Oo Fl C Ar number Oc Oo Fl r Ar repository-path Oc Oo Fl s Oc Oo Fl w Oc Op Ar object1 Ar object2 | Ar path
799 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
800 bd81cfb7 2020-04-19 stsp local changes in the work tree.
803 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
805 d24820bf 2019-08-11 stsp If two arguments are provided, treat each argument as a reference, a tag
806 d24820bf 2019-08-11 stsp name, or an object ID SHA1 hash, and display differences between the
807 d24820bf 2019-08-11 stsp corresponding objects.
808 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
809 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
810 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
812 c0cc5c62 2018-10-18 stsp The options for
813 c0cc5c62 2018-10-18 stsp .Cm got diff
814 c0cc5c62 2018-10-18 stsp are as follows:
815 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
817 64453f7e 2020-11-21 stsp Treat file contents as ASCII text even if binary data is detected.
818 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
819 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
820 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
821 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
822 b72f483a 2019-02-05 stsp Use the repository at the specified path.
823 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
824 b72f483a 2019-02-05 stsp working directory.
825 b72f483a 2019-02-05 stsp If this directory is a
827 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
829 4ed9f614 2019-08-04 stsp Show changes staged with
830 4ed9f614 2019-08-04 stsp .Cm got stage
831 bd81cfb7 2020-04-19 stsp instead of showing local changes in the work tree.
832 4ed9f614 2019-08-04 stsp This option is only valid when
833 4ed9f614 2019-08-04 stsp .Cm got diff
834 4ed9f614 2019-08-04 stsp is invoked in a work tree.
836 63035f9f 2019-10-06 stsp Ignore whitespace-only changes.
839 bc26cce8 2019-08-04 stsp Short alias for
841 dfc23429 2019-08-11 stsp .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
842 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
844 1ff8e573 2018-08-02 stsp The options for
845 1ff8e573 2018-08-02 stsp .Cm got blame
846 1ff8e573 2018-08-02 stsp are as follows:
847 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
848 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
849 1ff8e573 2018-08-02 stsp Start traversing history at the specified
850 1ff8e573 2018-08-02 stsp .Ar commit .
851 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
852 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
853 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
854 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
855 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
856 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
857 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
858 1ff8e573 2018-08-02 stsp working directory.
859 0c06baac 2019-02-05 stsp If this directory is a
861 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
864 bc26cce8 2019-08-04 stsp Short alias for
865 bc26cce8 2019-08-04 stsp .Cm blame .
866 dfc23429 2019-08-11 stsp .It Cm tree Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl i Oc Oo Fl R Oc Op Ar path
867 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
868 5de5890b 2018-10-18 stsp directory path in the repository.
869 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
870 db0c2996 2019-02-10 stsp annotations:
871 db0c2996 2019-02-10 stsp .Bl -column YXZ description
872 848d6979 2019-08-12 stsp .It @ Ta entry is a symbolic link
873 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
874 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
875 63c5ca5d 2019-08-24 stsp .It $ Ta entry is a Git submodule
878 0d6c6ee3 2020-05-20 stsp Symbolic link entries are also annotated with the target path of the link.
882 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
883 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
884 0c849583 2019-02-05 stsp if there is no work tree.
886 5de5890b 2018-10-18 stsp The options for
887 5de5890b 2018-10-18 stsp .Cm got tree
888 5de5890b 2018-10-18 stsp are as follows:
889 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
890 5de5890b 2018-10-18 stsp .It Fl c Ar commit
891 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
892 5de5890b 2018-10-18 stsp .Ar commit .
893 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
894 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
895 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
896 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
897 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
898 5de5890b 2018-10-18 stsp Use the repository at the specified path.
899 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
900 5de5890b 2018-10-18 stsp working directory.
901 0c849583 2019-02-05 stsp If this directory is a
903 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
905 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
907 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
910 bc26cce8 2019-08-04 stsp Short alias for
912 e31abbf2 2020-03-22 stsp .It Cm ref Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl c Ar object Oc Oo Fl s Ar reference Oc Oo Fl d Oc Op Ar name
913 d0eebce4 2019-03-11 stsp Manage references in a repository.
915 e31abbf2 2020-03-22 stsp References may be listed, created, deleted, and changed.
916 e31abbf2 2020-03-22 stsp When creating, deleting, or changing a reference the specified
918 e31abbf2 2020-03-22 stsp must be an absolute reference name, i.e. it must begin with
919 f16e4044 2019-10-09 stsp .Dq refs/ .
921 d0eebce4 2019-03-11 stsp The options for
922 d0eebce4 2019-03-11 stsp .Cm got ref
923 d0eebce4 2019-03-11 stsp are as follows:
924 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
925 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
926 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
927 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
928 d0eebce4 2019-03-11 stsp working directory.
929 d0eebce4 2019-03-11 stsp If this directory is a
931 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
933 b2070a3f 2020-03-22 stsp List references in the repository.
936 b2070a3f 2020-03-22 stsp is specified, list all existing references in the repository.
939 b2070a3f 2020-03-22 stsp is a reference namespace, list all references in this namespace.
940 b2070a3f 2020-03-22 stsp Otherwise, show only the reference with the given
942 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
944 e31abbf2 2020-03-22 stsp .It Fl c Ar object
945 e31abbf2 2020-03-22 stsp Create a reference or change an existing reference.
946 e31abbf2 2020-03-22 stsp The reference with the specified
948 e31abbf2 2020-03-22 stsp will point at the specified
949 e31abbf2 2020-03-22 stsp .Ar object.
950 e31abbf2 2020-03-22 stsp The expected
952 e31abbf2 2020-03-22 stsp argument is a ID SHA1 hash or an existing reference or tag name which will
953 e31abbf2 2020-03-22 stsp be resolved to the ID of a corresponding commit, tree, tag, or blob object.
954 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
956 e31abbf2 2020-03-22 stsp .It Fl s Ar reference
957 e31abbf2 2020-03-22 stsp Create a symbolic reference, or change an existing symbolic reference.
958 e31abbf2 2020-03-22 stsp The symbolic reference with the specified
960 e31abbf2 2020-03-22 stsp will point at the specified
961 e31abbf2 2020-03-22 stsp .Ar reference
962 e31abbf2 2020-03-22 stsp which must already exist in the repository.
963 d1c1ae5f 2019-08-12 stsp Care should be taken not to create loops between references when
964 d1c1ae5f 2019-08-12 stsp this option is used.
965 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
968 e31abbf2 2020-03-22 stsp Delete the reference with the specified
970 e31abbf2 2020-03-22 stsp from the repository.
971 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
974 da76fce2 2020-02-24 stsp .It Cm branch Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl d Ar name Oc Oo Fl n Oc Op Ar name
975 da76fce2 2020-02-24 stsp Create, list, or delete branches.
977 4e759de4 2019-06-26 stsp Branches are managed via references which live in the
978 4e759de4 2019-06-26 stsp .Dq refs/heads/
979 4e759de4 2019-06-26 stsp reference namespace.
981 4e759de4 2019-06-26 stsp .Cm got branch
982 4e759de4 2019-06-26 stsp command operates on references in this namespace only.
984 ad89fa31 2019-10-04 stsp If invoked in a work tree without any arguments, print the name of the
985 ad89fa31 2019-10-04 stsp work tree's current branch.
989 a74f7e83 2019-11-10 stsp argument is passed, attempt to create a branch reference with the given name.
990 a74f7e83 2019-11-10 stsp By default the new branch reference will point at the latest commit on the
991 a74f7e83 2019-11-10 stsp work tree's current branch if invoked in a work tree, and otherwise to a commit
992 a74f7e83 2019-11-10 stsp resolved via the repository's HEAD reference.
994 da76fce2 2020-02-24 stsp If invoked in a work tree, once the branch was created successfully
995 da76fce2 2020-02-24 stsp switch the work tree's head reference to the newly created branch and
996 da76fce2 2020-02-24 stsp update files across the entire work tree, just like
997 da76fce2 2020-02-24 stsp .Cm got update -b Ar name
999 da76fce2 2020-02-24 stsp Show the status of each affected file, using the following status codes:
1000 da76fce2 2020-02-24 stsp .Bl -column YXZ description
1001 da76fce2 2020-02-24 stsp .It U Ta file was updated and contained no local changes
1002 da76fce2 2020-02-24 stsp .It G Ta file was updated and local changes were merged cleanly
1003 da76fce2 2020-02-24 stsp .It C Ta file was updated and conflicts occurred during merge
1004 da76fce2 2020-02-24 stsp .It D Ta file was deleted
1005 da76fce2 2020-02-24 stsp .It A Ta new file was added
1006 da76fce2 2020-02-24 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
1007 da76fce2 2020-02-24 stsp .It ! Ta a missing versioned file was restored
1010 4e759de4 2019-06-26 stsp The options for
1011 4e759de4 2019-06-26 stsp .Cm got branch
1012 4e759de4 2019-06-26 stsp are as follows:
1013 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
1014 a74f7e83 2019-11-10 stsp .It Fl c Ar commit
1015 a74f7e83 2019-11-10 stsp Make a newly created branch reference point at the specified
1016 a74f7e83 2019-11-10 stsp .Ar commit .
1017 a74f7e83 2019-11-10 stsp The expected
1018 a74f7e83 2019-11-10 stsp .Ar commit
1019 a74f7e83 2019-11-10 stsp argument is a commit ID SHA1 hash or an existing reference
1020 a74f7e83 2019-11-10 stsp or tag name which will be resolved to a commit ID.
1021 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
1022 4e759de4 2019-06-26 stsp Use the repository at the specified path.
1023 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
1024 4e759de4 2019-06-26 stsp working directory.
1025 4e759de4 2019-06-26 stsp If this directory is a
1027 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
1029 4e759de4 2019-06-26 stsp List all existing branches in the repository.
1030 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
1031 ba882ee3 2019-07-11 stsp with one the following annotations:
1032 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
1033 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
1034 1dd86744 2019-08-12 anthony .It \(a~ Ta work tree's base commit is out-of-date
1036 4e759de4 2019-06-26 stsp .It Fl d Ar name
1037 4e759de4 2019-06-26 stsp Delete the branch with the specified name from the repository.
1038 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
1039 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
1040 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
1041 ce33d90e 2019-07-14 stsp Git's garbage collector.
1043 da76fce2 2020-02-24 stsp Do not switch and update the work tree after creating a new branch.
1046 97b3a7be 2019-07-09 stsp Short alias for
1047 97b3a7be 2019-07-09 stsp .Cm branch .
1048 80106605 2020-02-24 stsp .It Cm tag Oo Fl c Ar commit Oc Oo Fl m Ar message Oc Oo Fl r Ar repository-path Oc Oo Fl l Oc Ar name
1049 8e7bd50a 2019-08-22 stsp Manage tags in a repository.
1051 8e7bd50a 2019-08-22 stsp Tags are managed via references which live in the
1052 8e7bd50a 2019-08-22 stsp .Dq refs/tags/
1053 8e7bd50a 2019-08-22 stsp reference namespace.
1055 8e7bd50a 2019-08-22 stsp .Cm got tag
1056 8e7bd50a 2019-08-22 stsp command operates on references in this namespace only.
1057 b3cd068e 2019-08-22 stsp References in this namespace point at tag objects which contain a pointer
1058 b3cd068e 2019-08-22 stsp to another object, a tag message, as well as author and timestamp information.
1060 80106605 2020-02-24 stsp Attempt to create a tag with the given
1061 8e7bd50a 2019-08-22 stsp .Ar name ,
1062 8e7bd50a 2019-08-22 stsp and make this tag point at the given
1063 8e7bd50a 2019-08-22 stsp .Ar commit .
1064 8e7bd50a 2019-08-22 stsp If no commit is specified, default to the latest commit on the work tree's
1065 8e7bd50a 2019-08-22 stsp current branch if invoked in a work tree, and to a commit resolved via
1066 8e7bd50a 2019-08-22 stsp the repository's HEAD reference otherwise.
1068 8e7bd50a 2019-08-22 stsp The options for
1069 8e7bd50a 2019-08-22 stsp .Cm got tag
1070 8e7bd50a 2019-08-22 stsp are as follows:
1071 8e7bd50a 2019-08-22 stsp .Bl -tag -width Ds
1072 80106605 2020-02-24 stsp .It Fl c Ar commit
1073 80106605 2020-02-24 stsp Make the newly created tag reference point at the specified
1074 80106605 2020-02-24 stsp .Ar commit .
1075 80106605 2020-02-24 stsp The expected
1076 80106605 2020-02-24 stsp .Ar commit
1077 80106605 2020-02-24 stsp argument is a commit ID SHA1 hash or an existing reference or tag name which
1078 80106605 2020-02-24 stsp will be resolved to a commit ID.
1079 80106605 2020-02-24 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1080 80106605 2020-02-24 stsp automatically, provided the abbreviation is unique.
1081 8e7bd50a 2019-08-22 stsp .It Fl m Ar message
1082 80106605 2020-02-24 stsp Use the specified tag message when creating the new tag.
1083 8e7bd50a 2019-08-22 stsp Without the
1086 3a62228f 2019-11-08 stsp .Cm got tag
1087 8e7bd50a 2019-08-22 stsp opens a temporary file in an editor where a tag message can be written.
1088 8e7bd50a 2019-08-22 stsp .It Fl r Ar repository-path
1089 8e7bd50a 2019-08-22 stsp Use the repository at the specified path.
1090 8e7bd50a 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1091 8e7bd50a 2019-08-22 stsp working directory.
1092 8e7bd50a 2019-08-22 stsp If this directory is a
1094 8e7bd50a 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1096 8e7bd50a 2019-08-22 stsp List all existing tags in the repository instead of creating a new tag.
1097 8e7bd50a 2019-08-22 stsp If this option is used, no other command-line arguments are allowed.
1100 8e7bd50a 2019-08-22 stsp By design, the
1101 8e7bd50a 2019-08-22 stsp .Cm got tag
1102 8e7bd50a 2019-08-22 stsp command will not delete tags or change existing tags.
1103 8e7bd50a 2019-08-22 stsp If a tag must be deleted, the
1104 8e7bd50a 2019-08-22 stsp .Cm got ref
1105 8e7bd50a 2019-08-22 stsp command may be used to delete a tag's reference.
1106 8e7bd50a 2019-08-22 stsp This should only be done if the tag has not already been copied to
1107 8e7bd50a 2019-08-22 stsp another repository.
1108 022fae89 2019-12-06 tracey .It Cm add Oo Fl R Oc Oo Fl I Oc Ar path ...
1109 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
1110 d00136be 2019-03-26 stsp repository in the next commit.
1112 4e68cba3 2019-11-23 stsp The options for
1113 4e68cba3 2019-11-23 stsp .Cm got add
1114 4e68cba3 2019-11-23 stsp are as follows:
1115 4e68cba3 2019-11-23 stsp .Bl -tag -width Ds
1117 4e68cba3 2019-11-23 stsp Permit recursion into directories.
1118 4e68cba3 2019-11-23 stsp If this option is not specified,
1119 4e68cba3 2019-11-23 stsp .Cm got add
1120 4e68cba3 2019-11-23 stsp will refuse to run if a specified
1122 4e68cba3 2019-11-23 stsp is a directory.
1123 022fae89 2019-12-06 tracey .It Fl I
1124 022fae89 2019-12-06 tracey With -R, add files even if they match a
1125 022fae89 2019-12-06 tracey .Cm got status
1126 022fae89 2019-12-06 tracey ignore pattern.
1128 766841c2 2020-08-13 stsp .It Cm remove Oo Fl f Oc Oo Fl k Oc Oo Fl R Oc Oo Fl s Ar status-codes Oc Ar path ...
1129 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
1130 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
1132 2ec1f75b 2019-03-26 stsp The options for
1133 86d25a1b 2019-07-11 stsp .Cm got remove
1134 2ec1f75b 2019-03-26 stsp are as follows:
1135 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
1137 bd81cfb7 2020-04-19 stsp Perform the operation even if a file contains local modifications.
1138 70e3e7f5 2019-12-13 tracey .It Fl k
1139 70e3e7f5 2019-12-13 tracey Keep affected files on disk.
1140 f2a9dc41 2019-12-13 tracey .It Fl R
1141 f2a9dc41 2019-12-13 tracey Permit recursion into directories.
1142 f2a9dc41 2019-12-13 tracey If this option is not specified,
1143 f2a9dc41 2019-12-13 tracey .Cm got remove
1144 f2a9dc41 2019-12-13 tracey will refuse to run if a specified
1145 f2a9dc41 2019-12-13 tracey .Ar path
1146 f2a9dc41 2019-12-13 tracey is a directory.
1147 766841c2 2020-08-13 stsp .It Fl s Ar status-codes
1148 766841c2 2020-08-13 stsp Only delete files with a modification status matching one of the
1149 766841c2 2020-08-13 stsp single-character status codes contained in the
1150 766841c2 2020-08-13 stsp .Ar status-codes
1152 766841c2 2020-08-13 stsp The following status codes may be specified:
1153 766841c2 2020-08-13 stsp .Bl -column YXZ description
1154 766841c2 2020-08-13 stsp .It M Ta modified file (this implies the
1157 766841c2 2020-08-13 stsp .It ! Ta versioned file expected on disk but missing
1161 648e4ef7 2019-07-09 stsp Short alias for
1162 648e4ef7 2019-07-09 stsp .Cm remove .
1163 dfc23429 2019-08-11 stsp .It Cm revert Oo Fl p Oc Oo Fl F Ar response-script Oc Oo Fl R Oc Ar path ...
1164 bd81cfb7 2020-04-19 stsp Revert any local changes in files at the specified paths in a work tree.
1165 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
1166 1dd86744 2019-08-12 anthony work tree's base commit.
1167 1dd86744 2019-08-12 anthony There is no way to bring discarded changes back after
1168 a129376b 2019-03-28 stsp .Cm got revert !
1170 e20a8b6f 2019-06-04 stsp If a file was added with
1171 a129376b 2019-03-28 stsp .Cm got add
1172 a129376b 2019-03-28 stsp it will become an unversioned file again.
1173 e20a8b6f 2019-06-04 stsp If a file was deleted with
1174 86d25a1b 2019-07-11 stsp .Cm got remove
1175 a129376b 2019-03-28 stsp it will be restored.
1177 0f6d7415 2019-08-08 stsp The options for
1178 0f6d7415 2019-08-08 stsp .Cm got revert
1179 0f6d7415 2019-08-08 stsp are as follows:
1180 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
1182 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
1183 33aa809d 2019-08-08 stsp changes to revert based on
1185 33aa809d 2019-08-08 stsp (revert change),
1187 33aa809d 2019-08-08 stsp (keep change), and
1189 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
1190 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
1191 33aa809d 2019-08-08 stsp modified file content can be reverted.
1192 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
1193 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
1196 33aa809d 2019-08-08 stsp option, read
1201 33aa809d 2019-08-08 stsp responses line-by-line from the specified
1202 33aa809d 2019-08-08 stsp .Ar response-script
1203 33aa809d 2019-08-08 stsp file instead of prompting interactively.
1205 0f6d7415 2019-08-08 stsp Permit recursion into directories.
1206 0f6d7415 2019-08-08 stsp If this option is not specified,
1207 0f6d7415 2019-08-08 stsp .Cm got revert
1208 0f6d7415 2019-08-08 stsp will refuse to run if a specified
1210 0f6d7415 2019-08-08 stsp is a directory.
1213 97b3a7be 2019-07-09 stsp Short alias for
1214 97b3a7be 2019-07-09 stsp .Cm revert .
1215 35213c7c 2020-07-23 stsp .It Cm commit Oo Fl m Ar message Oc Oo Fl S Oc Op Ar path ...
1216 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
1217 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
1220 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
1221 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
1223 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
1224 1dd86744 2019-08-12 anthony .Cm got stage ,
1225 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
1226 4ed9f614 2019-08-04 stsp have not been staged.
1228 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
1229 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
1230 15cd91f7 2019-05-12 stsp .It M Ta modified file
1231 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
1232 15cd91f7 2019-05-12 stsp .It A Ta new file was added
1233 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
1236 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
1237 996d5ccd 2019-08-05 stsp recorded base commit.
1240 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
1241 15cd91f7 2019-05-12 stsp multiple base commits.
1242 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
1243 47ec7be7 2019-05-12 stsp .Cm got update
1244 47ec7be7 2019-05-12 stsp across the entire work tree.
1247 15cd91f7 2019-05-12 stsp .Cm got commit
1248 15cd91f7 2019-05-12 stsp command requires the
1249 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
1250 aba9c984 2019-09-08 stsp environment variable to be set,
1251 257add31 2020-09-09 stsp unless an author has been configured in
1252 257add31 2020-09-09 stsp .Xr got.conf 5
1254 aba9c984 2019-09-08 stsp .Dv user.name
1256 709ae9eb 2019-09-08 stsp .Dv user.email
1257 709ae9eb 2019-09-08 stsp configuration settings can be
1258 aba9c984 2019-09-08 stsp obtained from the repository's
1259 aba9c984 2019-09-08 stsp .Pa .git/config
1260 c9956ddf 2019-09-08 stsp file or from Git's global
1261 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1262 c9956ddf 2019-09-08 stsp configuration file.
1264 74416c47 2019-05-09 stsp The options for
1265 74416c47 2019-05-09 stsp .Cm got commit
1266 74416c47 2019-05-09 stsp are as follows:
1267 74416c47 2019-05-09 stsp .Bl -tag -width Ds
1268 74ff3f23 2019-07-07 stsp .It Fl m Ar message
1269 74416c47 2019-05-09 stsp Use the specified log message when creating the new commit.
1270 23594da9 2019-05-13 stsp Without the
1273 23594da9 2019-05-13 stsp .Cm got commit
1274 23594da9 2019-05-13 stsp opens a temporary file in an editor where a log message can be written.
1276 af358f55 2020-07-23 stsp Allow the addition of symbolic links which point outside of the path space
1277 af358f55 2020-07-23 stsp that is under version control.
1278 af358f55 2020-07-23 stsp By default,
1279 af358f55 2020-07-23 stsp .Cm got commit
1280 af358f55 2020-07-23 stsp will reject such symbolic links due to safety concerns.
1281 35213c7c 2020-07-23 stsp As a precaution,
1283 af358f55 2020-07-23 stsp may decide to represent such a symbolic link as a regular file which contains
1284 af358f55 2020-07-23 stsp the link's target path, rather than creating an actual symbolic link which
1285 af358f55 2020-07-23 stsp points outside of the work tree.
1286 af358f55 2020-07-23 stsp Use of this option is discouraged because external mechanisms such as
1287 af358f55 2020-07-23 stsp .Dq make obj
1288 af358f55 2020-07-23 stsp are better suited for managing symbolic links to paths not under
1289 af358f55 2020-07-23 stsp version control.
1292 cfce0458 2019-07-28 stsp .Cm got commit
1293 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
1294 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
1295 916f288c 2019-07-30 stsp .Dq refs/heads/
1296 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
1297 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
1298 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
1299 cfce0458 2019-07-28 stsp If a path is found to be out of date,
1300 cfce0458 2019-07-28 stsp .Cm got update
1301 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
1302 cfce0458 2019-07-28 stsp in the repository.
1304 97b3a7be 2019-07-09 stsp Short alias for
1305 97b3a7be 2019-07-09 stsp .Cm commit .
1306 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
1307 234035bc 2019-06-01 stsp Merge changes from a single
1308 234035bc 2019-06-01 stsp .Ar commit
1309 234035bc 2019-06-01 stsp into the work tree.
1310 234035bc 2019-06-01 stsp The specified
1311 234035bc 2019-06-01 stsp .Ar commit
1312 234035bc 2019-06-01 stsp must be on a different branch than the work tree's base commit.
1313 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
1314 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1315 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
1317 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
1318 234035bc 2019-06-01 stsp .Bl -column YXZ description
1319 234035bc 2019-06-01 stsp .It G Ta file was merged
1320 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
1321 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
1322 234035bc 2019-06-01 stsp .It D Ta file was deleted
1323 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
1324 234035bc 2019-06-01 stsp .It A Ta new file was added
1325 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1326 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1329 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
1330 234035bc 2019-06-01 stsp may be viewed with
1331 234035bc 2019-06-01 stsp .Cm got diff ,
1332 234035bc 2019-06-01 stsp amended manually or with further
1333 234035bc 2019-06-01 stsp .Cm got cherrypick
1335 234035bc 2019-06-01 stsp committed with
1336 234035bc 2019-06-01 stsp .Cm got commit ,
1337 234035bc 2019-06-01 stsp or discarded again with
1338 234035bc 2019-06-01 stsp .Cm got revert .
1340 234035bc 2019-06-01 stsp .Cm got cherrypick
1341 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
1342 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
1343 234035bc 2019-06-01 stsp to a single base commit with
1344 234035bc 2019-06-01 stsp .Cm got update .
1345 234035bc 2019-06-01 stsp If the work tree already contains files with merge conflicts, these
1346 234035bc 2019-06-01 stsp conflicts must be resolved first.
1348 97b3a7be 2019-07-09 stsp Short alias for
1349 97b3a7be 2019-07-09 stsp .Cm cherrypick .
1350 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
1351 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
1352 5ef14e63 2019-06-02 stsp .Ar commit
1353 5ef14e63 2019-06-02 stsp into the work tree.
1354 5ef14e63 2019-06-02 stsp The specified
1355 5ef14e63 2019-06-02 stsp .Ar commit
1356 5ef14e63 2019-06-02 stsp must be on the same branch as the work tree's base commit.
1357 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
1358 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1359 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
1361 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
1362 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
1363 5ef14e63 2019-06-02 stsp .It G Ta file was merged
1364 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
1365 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
1366 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
1367 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
1368 5ef14e63 2019-06-02 stsp .It A Ta new file was added
1369 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1370 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1373 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
1374 5ef14e63 2019-06-02 stsp which may be viewed with
1375 5ef14e63 2019-06-02 stsp .Cm got diff ,
1376 5ef14e63 2019-06-02 stsp amended manually or with further
1377 778a73c2 2019-07-12 stsp .Cm got backout
1379 5ef14e63 2019-06-02 stsp committed with
1380 5ef14e63 2019-06-02 stsp .Cm got commit ,
1381 5ef14e63 2019-06-02 stsp or discarded again with
1382 5ef14e63 2019-06-02 stsp .Cm got revert .
1384 92228c38 2019-06-02 stsp .Cm got backout
1385 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
1386 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
1387 92228c38 2019-06-02 stsp to a single base commit with
1388 92228c38 2019-06-02 stsp .Cm got update .
1389 92228c38 2019-06-02 stsp If the work tree already contains files with merge conflicts, these
1390 92228c38 2019-06-02 stsp conflicts must be resolved first.
1392 97b3a7be 2019-07-09 stsp Short alias for
1393 97b3a7be 2019-07-09 stsp .Cm backout .
1394 dfc23429 2019-08-11 stsp .It Cm rebase Oo Fl a Oc Oo Fl c Oc Op Ar branch
1395 818c7501 2019-07-11 stsp Rebase commits on the specified
1396 818c7501 2019-07-11 stsp .Ar branch
1397 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
1399 818c7501 2019-07-11 stsp .Ar branch
1400 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
1401 bc3056e3 2019-08-18 stsp Rebasing begins with the first descendant commit of the youngest
1402 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
1403 818c7501 2019-07-11 stsp .Ar branch
1404 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
1405 f09e2405 2019-07-11 stsp of the specified
1406 818c7501 2019-07-11 stsp .Ar branch
1407 f09e2405 2019-07-11 stsp has been rebased.
1410 2b6826ba 2020-02-24 stsp .Cm got rebase
1411 2b6826ba 2020-02-24 stsp is used as intended, the specified
1412 2b6826ba 2020-02-24 stsp .Ar branch
1413 c10890ce 2020-02-25 stsp represents a local commit history and may already contain changes
1414 c10890ce 2020-02-25 stsp that are not yet visible in any other repositories.
1415 2b6826ba 2020-02-24 stsp The work tree's current branch, which must be set with
1416 2b6826ba 2020-02-24 stsp .Cm got update -b
1417 2b6826ba 2020-02-24 stsp before starting the
1418 2b6826ba 2020-02-24 stsp .Cm rebase
1419 2b6826ba 2020-02-24 stsp operation, represents a branch from a remote repository which shares
1420 2b6826ba 2020-02-24 stsp a common history with the specified
1421 2b6826ba 2020-02-24 stsp .Ar branch
1422 c10890ce 2020-02-25 stsp but has progressed, and perhaps diverged, due to commits added to the
1423 c10890ce 2020-02-25 stsp remote repository.
1425 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
1426 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
1427 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
1428 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
1429 818c7501 2019-07-11 stsp .Ar branch ,
1430 818c7501 2019-07-11 stsp but with different commit IDs.
1431 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
1432 f09e2405 2019-07-11 stsp the new version of the specified
1433 818c7501 2019-07-11 stsp .Ar branch
1434 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
1436 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
1437 818c7501 2019-07-11 stsp using the following status codes:
1438 818c7501 2019-07-11 stsp .Bl -column YXZ description
1439 818c7501 2019-07-11 stsp .It G Ta file was merged
1440 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
1441 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
1442 818c7501 2019-07-11 stsp .It D Ta file was deleted
1443 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
1444 818c7501 2019-07-11 stsp .It A Ta new file was added
1445 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1446 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1449 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
1450 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
1451 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
1452 818c7501 2019-07-11 stsp .Ar branch
1453 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
1455 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
1456 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
1457 f09e2405 2019-07-11 stsp when the rebase operation continues.
1459 818c7501 2019-07-11 stsp .Cm got rebase
1460 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
1461 a85446b2 2020-01-04 stsp If the work tree is not yet fully updated to the tip commit of its
1462 a85446b2 2020-01-04 stsp branch then the work tree must first be updated with
1463 818c7501 2019-07-11 stsp .Cm got update .
1464 4ed9f614 2019-08-04 stsp If changes have been staged with
1465 4ed9f614 2019-08-04 stsp .Cm got stage ,
1466 bc3056e3 2019-08-18 stsp these changes must first be committed with
1467 4ed9f614 2019-08-04 stsp .Cm got commit
1468 4ed9f614 2019-08-04 stsp or unstaged with
1469 4ed9f614 2019-08-04 stsp .Cm got unstage .
1470 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
1471 f09e2405 2019-07-11 stsp committed with
1472 f09e2405 2019-07-11 stsp .Cm got commit
1473 f09e2405 2019-07-11 stsp or reverted with
1474 f09e2405 2019-07-11 stsp .Cm got revert .
1476 64c6d990 2019-07-11 stsp .Ar branch
1477 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
1478 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
1481 7d5807f4 2019-07-11 stsp .Cm got update
1483 7d5807f4 2019-07-11 stsp .Cm got commit
1484 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
1485 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
1486 7d5807f4 2019-07-11 stsp conflict resolution purposes.
1488 818c7501 2019-07-11 stsp The options for
1489 818c7501 2019-07-11 stsp .Cm got rebase
1490 818c7501 2019-07-11 stsp are as follows:
1491 818c7501 2019-07-11 stsp .Bl -tag -width Ds
1493 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
1494 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1496 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
1497 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1500 818c7501 2019-07-11 stsp Short alias for
1501 818c7501 2019-07-11 stsp .Cm rebase .
1502 466785b9 2020-12-10 jrick .It Cm histedit Oo Fl a Oc Oo Fl c Oc Oo Fl f Oc Oo Fl F Ar histedit-script Oc Oo Fl m Oc
1503 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
1504 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
1506 6e54d307 2020-02-24 stsp Before starting a
1507 6e54d307 2020-02-24 stsp .Cm histedit
1508 6e54d307 2020-02-24 stsp operation the work tree's current branch must be set with
1509 6e54d307 2020-02-24 stsp .Cm got update -b
1510 6e54d307 2020-02-24 stsp to the branch which should be edited, unless this branch is already the
1511 6e54d307 2020-02-24 stsp current branch of the work tree.
1512 6e54d307 2020-02-24 stsp The tip of this branch represents the upper bound (inclusive) of commits
1513 6e54d307 2020-02-24 stsp touched by the
1514 6e54d307 2020-02-24 stsp .Cm histedit
1515 6e54d307 2020-02-24 stsp operation.
1517 6e54d307 2020-02-24 stsp Furthermore, the work tree's base commit
1518 6e54d307 2020-02-24 stsp must be set with
1519 6e54d307 2020-02-24 stsp .Cm got update -c
1520 6e54d307 2020-02-24 stsp to a point in this branch's commit history where editing should begin.
1521 6e54d307 2020-02-24 stsp This commit represents the lower bound (non-inclusive) of commits touched
1523 6e54d307 2020-02-24 stsp .Cm histedit
1524 6e54d307 2020-02-24 stsp operation.
1526 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
1527 0ebf8283 2019-07-24 stsp .Ar histedit script
1528 46fa4c83 2020-02-24 stsp which can be written in an editor based on a template, passed on the
1529 46fa4c83 2020-02-24 stsp command line, or generated with the
1535 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
1536 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
1537 0ebf8283 2019-07-24 stsp whitespace and an argument.
1538 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
1539 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
1540 0ebf8283 2019-07-24 stsp Lines which begin with the
1542 0ebf8283 2019-07-24 stsp character are ignored entirely.
1544 0ebf8283 2019-07-24 stsp The available commands are as follows:
1545 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
1546 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
1547 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
1548 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
1549 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
1550 0ebf8283 2019-07-24 stsp listed further below that will be used.
1551 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
1552 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
1553 0ebf8283 2019-07-24 stsp the commit on the previous line.
1554 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
1555 0ebf8283 2019-07-24 stsp log message can be written.
1558 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
1559 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
1560 5b87815e 2020-03-05 stsp No commit may be listed more than once.
1562 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
1563 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
1564 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
1565 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
1566 498a90b7 2019-07-25 stsp switched to it.
1568 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
1569 0ebf8283 2019-07-24 stsp using the following status codes:
1570 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
1571 0ebf8283 2019-07-24 stsp .It G Ta file was merged
1572 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
1573 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
1574 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
1575 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
1576 0ebf8283 2019-07-24 stsp .It A Ta new file was added
1577 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1578 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1581 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
1582 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
1583 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
1584 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
1586 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
1587 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
1588 0ebf8283 2019-07-24 stsp when the histedit operation continues.
1590 0ebf8283 2019-07-24 stsp .Cm got histedit
1591 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
1592 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
1593 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
1594 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
1595 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
1596 0ebf8283 2019-07-24 stsp to a single base commit with
1597 0ebf8283 2019-07-24 stsp .Cm got update .
1598 4ed9f614 2019-08-04 stsp If changes have been staged with
1599 4ed9f614 2019-08-04 stsp .Cm got stage ,
1600 bc3056e3 2019-08-18 stsp these changes must first be committed with
1601 4ed9f614 2019-08-04 stsp .Cm got commit
1602 4ed9f614 2019-08-04 stsp or unstaged with
1603 4ed9f614 2019-08-04 stsp .Cm got unstage .
1604 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
1605 0ebf8283 2019-07-24 stsp committed with
1606 0ebf8283 2019-07-24 stsp .Cm got commit
1607 0ebf8283 2019-07-24 stsp or reverted with
1608 0ebf8283 2019-07-24 stsp .Cm got revert .
1609 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
1610 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
1613 7ef62c4e 2020-02-24 stsp .Cm got update ,
1614 7ef62c4e 2020-02-24 stsp .Cm got rebase ,
1616 65db4ffb 2020-02-24 stsp .Cm got integrate
1617 65db4ffb 2020-02-24 stsp commands will refuse to run while a histedit operation is in progress.
1618 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
1619 0ebf8283 2019-07-24 stsp .Cm got commit
1620 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
1621 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
1623 0ebf8283 2019-07-24 stsp The options for
1624 0ebf8283 2019-07-24 stsp .Cm got histedit
1625 0ebf8283 2019-07-24 stsp are as follows:
1626 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
1628 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
1629 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1631 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
1632 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1634 466785b9 2020-12-10 jrick Fold all commits into a single commit.
1635 466785b9 2020-12-10 jrick This option is a quick equivalent to a histedit script which folds all
1636 466785b9 2020-12-10 jrick commits, combining them all into one commit.
1639 2a78779e 2020-12-11 stsp option can only be used when starting a new histedit operation.
1640 466785b9 2020-12-10 jrick If this option is used, no other command-line arguments are allowed.
1641 ddbfac99 2020-02-24 stsp .It Fl F Ar histedit-script
1642 ddbfac99 2020-02-24 stsp Use the specified
1643 ddbfac99 2020-02-24 stsp .Ar histedit-script
1644 ddbfac99 2020-02-24 stsp instead of opening a temporary file in an editor where a histedit script
1645 ddbfac99 2020-02-24 stsp can be written.
1647 083957f4 2020-02-24 stsp Edit log messages only.
1648 083957f4 2020-02-24 stsp This option is a quick equivalent to a histedit script which edits
1649 2bdefe56 2020-02-24 tracey only log messages but otherwise leaves every picked commit as-is.
1652 083957f4 2020-02-24 stsp option can only be used when starting a new histedit operation.
1653 083957f4 2020-02-24 stsp If this option is used, no other command-line arguments are allowed.
1656 0ebf8283 2019-07-24 stsp Short alias for
1657 0ebf8283 2019-07-24 stsp .Cm histedit .
1658 2822a352 2019-10-15 stsp .It Cm integrate Ar branch
1659 2822a352 2019-10-15 stsp Integrate the specified
1660 2822a352 2019-10-15 stsp .Ar branch
1661 2822a352 2019-10-15 stsp into the work tree's current branch.
1662 2822a352 2019-10-15 stsp Files in the work tree are updated to match the contents on the integrated
1663 2822a352 2019-10-15 stsp .Ar branch ,
1664 2822a352 2019-10-15 stsp and the reference of the work tree's branch is changed to point at the
1665 2822a352 2019-10-15 stsp head commit of the integrated
1666 2822a352 2019-10-15 stsp .Ar branch .
1668 2822a352 2019-10-15 stsp Both branches can be considered equivalent after integration since they
1669 2822a352 2019-10-15 stsp will be pointing at the same commit.
1670 2822a352 2019-10-15 stsp Both branches remain available for future work, if desired.
1671 2822a352 2019-10-15 stsp In case the integrated
1672 2822a352 2019-10-15 stsp .Ar branch
1673 2822a352 2019-10-15 stsp is no longer needed it may be deleted with
1674 2822a352 2019-10-15 stsp .Cm got branch -d .
1676 2822a352 2019-10-15 stsp Show the status of each affected file, using the following status codes:
1677 2822a352 2019-10-15 stsp .Bl -column YXZ description
1678 2822a352 2019-10-15 stsp .It U Ta file was updated
1679 2822a352 2019-10-15 stsp .It D Ta file was deleted
1680 2822a352 2019-10-15 stsp .It A Ta new file was added
1681 2822a352 2019-10-15 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
1682 2822a352 2019-10-15 stsp .It ! Ta a missing versioned file was restored
1685 2822a352 2019-10-15 stsp .Cm got integrate
1686 2822a352 2019-10-15 stsp will refuse to run if certain preconditions are not met.
1687 2822a352 2019-10-15 stsp Most importantly, the
1688 2822a352 2019-10-15 stsp .Ar branch
1689 2822a352 2019-10-15 stsp must have been rebased onto the work tree's current branch with
1690 2822a352 2019-10-15 stsp .Cm got rebase
1691 2822a352 2019-10-15 stsp before it can be integrated, in order to linearize commit history and
1692 2822a352 2019-10-15 stsp resolve merge conflicts.
1693 2822a352 2019-10-15 stsp If the work tree contains multiple base commits it must first be updated
1694 2822a352 2019-10-15 stsp to a single base commit with
1695 2822a352 2019-10-15 stsp .Cm got update .
1696 2822a352 2019-10-15 stsp If changes have been staged with
1697 2822a352 2019-10-15 stsp .Cm got stage ,
1698 2822a352 2019-10-15 stsp these changes must first be committed with
1699 2822a352 2019-10-15 stsp .Cm got commit
1700 2822a352 2019-10-15 stsp or unstaged with
1701 2822a352 2019-10-15 stsp .Cm got unstage .
1702 2822a352 2019-10-15 stsp If the work tree contains local changes, these changes must first be
1703 2822a352 2019-10-15 stsp committed with
1704 2822a352 2019-10-15 stsp .Cm got commit
1705 2822a352 2019-10-15 stsp or reverted with
1706 2822a352 2019-10-15 stsp .Cm got revert .
1708 2822a352 2019-10-15 stsp Short alias for
1709 2822a352 2019-10-15 stsp .Cm integrate .
1710 35213c7c 2020-07-23 stsp .It Cm stage Oo Fl l Oc Oo Fl p Oc Oo Fl F Ar response-script Oc Oo Fl S Oc Op Ar path ...
1711 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
1714 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
1715 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
1716 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
1717 4ed9f614 2019-08-04 stsp .Cm got status .
1719 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1720 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
1721 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
1722 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
1723 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
1726 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
1727 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
1728 9d8b19a4 2019-08-04 stsp committed.
1730 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
1731 4ed9f614 2019-08-04 stsp .Cm got commit ,
1732 4ed9f614 2019-08-04 stsp .Cm got status ,
1734 4ed9f614 2019-08-04 stsp .Cm got diff .
1735 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
1736 4ed9f614 2019-08-04 stsp .Cm got commit
1737 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
1738 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
1739 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
1741 4ed9f614 2019-08-04 stsp .Cm got status
1742 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
1744 4ed9f614 2019-08-04 stsp .Cm got diff
1745 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
1746 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
1748 4ed9f614 2019-08-04 stsp .Cm got revert
1749 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
1750 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
1752 4ed9f614 2019-08-04 stsp The options for
1753 4ed9f614 2019-08-04 stsp .Cm got stage
1754 4ed9f614 2019-08-04 stsp are as follows:
1755 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
1757 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
1758 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
1759 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
1760 1dd86744 2019-08-12 anthony among the specified paths.
1761 1dd86744 2019-08-12 anthony Otherwise, show all staged paths.
1763 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
1764 dc424a06 2019-08-07 stsp select or reject changes for staging based on
1766 6d23ec10 2019-08-08 stsp (stage change),
1768 6d23ec10 2019-08-08 stsp (reject change), and
1770 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
1771 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
1772 dc424a06 2019-08-07 stsp modified file content can be staged.
1773 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
1774 6d23ec10 2019-08-08 stsp their entirety.
1775 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
1778 3a070a2b 2019-08-07 stsp option, read
1783 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
1784 0e2f5884 2019-08-07 stsp .Ar response-script
1785 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
1787 af358f55 2020-07-23 stsp Allow staging of symbolic links which point outside of the path space
1788 af358f55 2020-07-23 stsp that is under version control.
1789 af358f55 2020-07-23 stsp By default,
1790 af358f55 2020-07-23 stsp .Cm got stage
1791 af358f55 2020-07-23 stsp will reject such symbolic links due to safety concerns.
1792 35213c7c 2020-07-23 stsp As a precaution,
1794 af358f55 2020-07-23 stsp may decide to represent such a symbolic link as a regular file which contains
1795 af358f55 2020-07-23 stsp the link's target path, rather than creating an actual symbolic link which
1796 af358f55 2020-07-23 stsp points outside of the work tree.
1797 af358f55 2020-07-23 stsp Use of this option is discouraged because external mechanisms such as
1798 af358f55 2020-07-23 stsp .Dq make obj
1799 af358f55 2020-07-23 stsp are better suited for managing symbolic links to paths not under
1800 af358f55 2020-07-23 stsp version control.
1803 4ed9f614 2019-08-04 stsp .Cm got stage
1804 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
1805 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
1806 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
1807 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
1808 4ed9f614 2019-08-04 stsp .Cm got update
1809 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
1810 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
1813 4ed9f614 2019-08-04 stsp .Cm got update ,
1814 4ed9f614 2019-08-04 stsp .Cm got rebase ,
1816 4ed9f614 2019-08-04 stsp .Cm got histedit
1817 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
1818 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
1819 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
1820 4ed9f614 2019-08-04 stsp .Cm got unstage
1821 4ed9f614 2019-08-04 stsp before it can be updated with
1822 4ed9f614 2019-08-04 stsp .Cm got update ,
1823 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
1825 4ed9f614 2019-08-04 stsp Short alias for
1826 4ed9f614 2019-08-04 stsp .Cm stage .
1827 dfc23429 2019-08-11 stsp .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
1828 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
1829 4ed9f614 2019-08-04 stsp back into non-staged status.
1832 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
1833 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
1835 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1836 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
1837 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
1838 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
1839 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
1840 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
1841 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
1842 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1845 2e1f37b0 2019-08-08 stsp The options for
1846 2e1f37b0 2019-08-08 stsp .Cm got unstage
1847 2e1f37b0 2019-08-08 stsp are as follows:
1848 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
1850 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
1851 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
1853 2e1f37b0 2019-08-08 stsp (unstage change),
1855 2e1f37b0 2019-08-08 stsp (keep change staged), and
1857 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
1858 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
1859 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
1860 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
1861 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
1864 2e1f37b0 2019-08-08 stsp option, read
1869 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
1870 2e1f37b0 2019-08-08 stsp .Ar response-script
1871 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
1874 4ed9f614 2019-08-04 stsp Short alias for
1875 4ed9f614 2019-08-04 stsp .Cm unstage .
1876 5be72254 2019-08-26 stsp .It Cm cat Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl P Oc Ar arg ...
1877 896e9b6f 2019-08-26 stsp Parse and print contents of objects to standard output in a line-based
1878 896e9b6f 2019-08-26 stsp text format.
1879 896e9b6f 2019-08-26 stsp Content of commit, tree, and tag objects is printed in a way similar
1880 896e9b6f 2019-08-26 stsp to the actual content stored in such objects.
1881 896e9b6f 2019-08-26 stsp Blob object contents are printed as they would appear in files on disk.
1883 896e9b6f 2019-08-26 stsp Attempt to interpret each argument as a reference, a tag name, or
1884 896e9b6f 2019-08-26 stsp an object ID SHA1 hash.
1885 01073a5d 2019-08-22 stsp References will be resolved to an object ID.
1886 01073a5d 2019-08-22 stsp Tag names will resolved to a tag object.
1887 01073a5d 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1888 01073a5d 2019-08-22 stsp automatically, provided the abbreviation is unique.
1890 896e9b6f 2019-08-26 stsp If none of the above interpretations produce a valid result, or if the
1892 896e9b6f 2019-08-26 stsp option is used, attempt to interpret the argument as a path which will
1893 896e9b6f 2019-08-26 stsp be resolved to the ID of an object found at this path in the repository.
1895 01073a5d 2019-08-22 stsp The options for
1896 01073a5d 2019-08-22 stsp .Cm got cat
1897 01073a5d 2019-08-22 stsp are as follows:
1898 01073a5d 2019-08-22 stsp .Bl -tag -width Ds
1899 896e9b6f 2019-08-26 stsp .It Fl c Ar commit
1900 896e9b6f 2019-08-26 stsp Look up paths in the specified
1901 896e9b6f 2019-08-26 stsp .Ar commit .
1902 896e9b6f 2019-08-26 stsp If this option is not used, paths are looked up in the commit resolved
1903 896e9b6f 2019-08-26 stsp via the repository's HEAD reference.
1904 896e9b6f 2019-08-26 stsp The expected argument is a commit ID SHA1 hash or an existing reference
1905 896e9b6f 2019-08-26 stsp or tag name which will be resolved to a commit ID.
1906 896e9b6f 2019-08-26 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1907 896e9b6f 2019-08-26 stsp automatically, provided the abbreviation is unique.
1908 01073a5d 2019-08-22 stsp .It Fl r Ar repository-path
1909 01073a5d 2019-08-22 stsp Use the repository at the specified path.
1910 01073a5d 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1911 01073a5d 2019-08-22 stsp working directory.
1912 01073a5d 2019-08-22 stsp If this directory is a
1914 01073a5d 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1916 896e9b6f 2019-08-26 stsp Interpret all arguments as paths only.
1917 896e9b6f 2019-08-26 stsp This option can be used to resolve ambiguity in cases where paths
1918 896e9b6f 2019-08-26 stsp look like tag names, reference names, or object IDs.
1920 b2118c49 2020-07-28 stsp .It Cm info Op Ar path ...
1921 b2118c49 2020-07-28 stsp Display meta-data stored in a work tree.
1923 b2118c49 2020-07-28 stsp .Xr got-worktree 5
1924 b2118c49 2020-07-28 stsp for details.
1926 b2118c49 2020-07-28 stsp The work tree to use is resolved implicitly by walking upwards from the
1927 b2118c49 2020-07-28 stsp current working directory.
1929 b2118c49 2020-07-28 stsp If one or more
1931 b2118c49 2020-07-28 stsp arguments are specified, show additional per-file information for tracked
1932 b2118c49 2020-07-28 stsp files located at or within these paths.
1935 b2118c49 2020-07-28 stsp argument corresponds to the work tree's root directory, display information
1936 b2118c49 2020-07-28 stsp for all tracked files.
1938 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
1939 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
1940 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
1941 74416c47 2019-05-09 stsp The author's name and email address for
1942 21a44f98 2019-07-15 stsp .Cm got commit
1944 21a44f98 2019-07-15 stsp .Cm got import ,
1945 74416c47 2019-05-09 stsp for example:
1946 aba9c984 2019-09-08 stsp .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
1949 84792843 2019-08-09 stsp may fail to parse commits without an email address in author data,
1951 84792843 2019-08-09 stsp attempts to reject
1952 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
1953 84792843 2019-08-09 stsp environment variables with a missing email address.
1955 50b0790e 2020-09-11 stsp .Ev GOT_AUTHOR will be overriden by configuration settings in
1956 50b0790e 2020-09-11 stsp .Xr got.conf 5
1957 50b0790e 2020-09-11 stsp or by Git's
1958 aba9c984 2019-09-08 stsp .Dv user.name
1960 709ae9eb 2019-09-08 stsp .Dv user.email
1961 709ae9eb 2019-09-08 stsp configuration settings in the repository's
1962 aba9c984 2019-09-08 stsp .Pa .git/config
1965 c9956ddf 2019-09-08 stsp .Dv user.name
1967 c9956ddf 2019-09-08 stsp .Dv user.email
1968 c9956ddf 2019-09-08 stsp configuration settings contained in Git's global
1969 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1970 257add31 2020-09-09 stsp configuration file will only be used if neither
1971 257add31 2020-09-09 stsp .Xr got.conf 5
1973 c9956ddf 2019-09-08 stsp .Ev GOT_AUTHOR
1974 257add31 2020-09-09 stsp environment variable provide author information.
1975 1dd86744 2019-08-12 anthony .It Ev VISUAL , EDITOR
1976 23594da9 2019-05-13 stsp The editor spawned by
1977 8e7bd50a 2019-08-22 stsp .Cm got commit ,
1978 46215d2a 2020-09-11 stsp .Cm got histedit ,
1979 8e7bd50a 2019-08-22 stsp .Cm got import ,
1981 8e7bd50a 2019-08-22 stsp .Cm got tag .
1982 5b735925 2020-09-15 stsp If not set, the
1984 5b735925 2020-09-15 stsp text editor will be spawned in order to give
1986 5b735925 2020-09-15 stsp the attention it deserves.
1987 b1ebc001 2019-08-13 stsp .It Ev GOT_LOG_DEFAULT_LIMIT
1988 b1ebc001 2019-08-13 stsp The default limit on the number of commits traversed by
1989 b1ebc001 2019-08-13 stsp .Cm got log .
1990 b1ebc001 2019-08-13 stsp If set to zero, the limit is unbounded.
1991 b1ebc001 2019-08-13 stsp This variable will be silently ignored if it is set to a non-numeric value.
1994 257add31 2020-09-09 stsp .Bl -tag -width packed-refs -compact
1995 257add31 2020-09-09 stsp .It Pa got.conf
1996 257add31 2020-09-09 stsp Repository-wide configuration settings for
1998 50b0790e 2020-09-11 stsp If present, a
1999 50b0790e 2020-09-11 stsp .Xr got.conf 5
2000 50b0790e 2020-09-11 stsp configuration file located in the root directory of a Git repository
2001 50b0790e 2020-09-11 stsp supersedes any relevant settings in Git's
2002 257add31 2020-09-09 stsp .Pa config
2005 50b0790e 2020-09-11 stsp .It Pa .got/got.conf
2006 50b0790e 2020-09-11 stsp Worktree-specific configuration settings for
2008 50b0790e 2020-09-11 stsp If present, a
2009 50b0790e 2020-09-11 stsp .Xr got.conf
2010 50b0790e 2020-09-11 stsp configuration file in the
2012 50b0790e 2020-09-11 stsp meta-data directory of a work tree supersedes any relevant settings in
2013 50b0790e 2020-09-11 stsp the repository's
2014 50b0790e 2020-09-11 stsp .Xr got.conf 5
2015 50b0790e 2020-09-11 stsp configuration file and Git's
2016 50b0790e 2020-09-11 stsp .Pa config
2019 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
2020 5c860e29 2018-03-12 stsp .Ex -std got
2021 97925469 2018-03-17 stsp .Sh EXAMPLES
2022 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
2025 fd039d72 2020-03-18 stsp .Dl $ cd /var/git/
2026 fd039d72 2020-03-18 stsp .Dl $ got clone ssh://git@github.com/openbsd/src.git
2028 fd039d72 2020-03-18 stsp Use of HTTP URLs currently requires
2029 fa6e0e48 2019-05-23 stsp .Xr git 1 :
2031 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
2032 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
2034 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
2036 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
2037 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
2038 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
2040 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
2041 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
2043 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
2045 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
2047 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
2049 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
2051 081470ac 2020-08-13 stsp In a work tree, display files in a potentially problematic state:
2053 081470ac 2020-08-13 stsp .Dl $ got status -s 'C!~?'
2055 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
2057 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
2059 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
2061 4e759de4 2019-06-26 stsp .Dl $ got branch -l
2063 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
2064 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
2065 d83d9d5c 2019-05-13 stsp which is forked off the
2066 d83d9d5c 2019-05-13 stsp .Dq master
2069 4e759de4 2019-06-26 stsp .Dl $ got branch unified-buffer-cache master
2071 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
2072 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
2073 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
2075 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
2077 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
2078 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
2080 fa6e0e48 2019-05-23 stsp .Dl $ got commit
2082 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
2083 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
2084 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
2086 48c8c60d 2020-01-27 stsp .Dl $ got log -p -l 3
2088 3d0ac559 2020-04-18 stsp As above, but display changes in the order in which
2089 04e9dcf3 2020-04-18 stsp .Xr patch 1
2090 04e9dcf3 2020-04-18 stsp could apply them in sequence:
2092 04e9dcf3 2020-04-18 stsp .Dl $ got log -p -l 3 -R
2094 5b666081 2020-02-24 stsp In a work tree or a git repository directory, log the history of a subdirectory:
2096 5b666081 2020-02-24 stsp .Dl $ got log sys/uvm
2098 5b666081 2020-02-24 stsp While operating inside a work tree, paths are specified relative to the current
2099 5b666081 2020-02-24 stsp working directory, so this command will log the subdirectory
2100 5b666081 2020-02-24 stsp .Pa sys/uvm :
2102 cf07f22b 2020-07-25 stsp .Dl $ cd sys/uvm && got log\ .
2104 5b666081 2020-02-24 stsp And this command has the same effect:
2106 5b666081 2020-02-24 stsp .Dl $ cd sys/dev/usb && got log ../../uvm
2108 b2118c49 2020-07-28 stsp And this command displays work tree meta-data about all tracked files:
2110 b2118c49 2020-07-28 stsp .Dl $ cd /usr/src
2111 b2118c49 2020-07-28 stsp .Dl $ got info\ . | less
2113 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
2115 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
2116 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
2118 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
2119 e70c17ce 2019-05-22 stsp with a pre-defined log message.
2121 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
2123 bcbc2272 2020-05-20 stsp Alternatively, create a new commit from local changes in a work tree
2124 bcbc2272 2020-05-20 stsp directory with a log message that has been prepared in the file
2125 bcbc2272 2020-05-20 stsp .Pa /tmp/msg .
2128 bcbc2272 2020-05-20 stsp is set as the
2129 bcbc2272 2020-05-20 stsp .Ev EDITOR ,
2130 bcbc2272 2020-05-20 stsp .Pa /tmp/msg
2131 bcbc2272 2020-05-20 stsp can be read into the buffer for review:
2133 bcbc2272 2020-05-20 stsp .Dl $ got commit
2134 bcbc2272 2020-05-20 stsp .Dl :r /tmp/msg
2136 95fc3404 2019-07-15 stsp Update any work tree checked out from the
2137 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
2138 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
2140 95fc3404 2019-07-15 stsp .Dl $ got update
2142 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
2143 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
2144 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
2146 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
2147 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
2148 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
2149 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
2151 469dd726 2020-03-20 stsp Fetch new upstream commits into the local repository's
2152 469dd726 2020-03-20 stsp .Dq origin/master
2155 469dd726 2020-03-20 stsp .Dl $ cd /usr/src
2156 469dd726 2020-03-20 stsp .Dl $ got fetch
2158 469dd726 2020-03-20 stsp In a repository created with a HTTP URL and
2159 469dd726 2020-03-20 stsp .Cm git clone --bare
2161 469dd726 2020-03-20 stsp .Xr git-fetch 1
2162 469dd726 2020-03-20 stsp command must be used instead:
2164 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
2165 469dd726 2020-03-20 stsp .Dl $ git fetch origin master:refs/remotes/origin/master
2167 469dd726 2020-03-20 stsp Rebase the local
2168 469dd726 2020-03-20 stsp .Dq master
2169 469dd726 2020-03-20 stsp branch to merge the new changes that are now visible on the
2170 469dd726 2020-03-20 stsp .Dq origin/master
2173 469dd726 2020-03-20 stsp .Dl $ cd /usr/src
2174 469dd726 2020-03-20 stsp .Dl $ got update -b origin/master
2175 469dd726 2020-03-20 stsp .Dl $ got rebase master
2177 fa6e0e48 2019-05-23 stsp Rebase the
2178 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
2179 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
2180 fa6e0e48 2019-05-23 stsp .Dq master
2183 818c7501 2019-07-11 stsp .Dl $ got update -b master
2184 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
2186 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
2187 1dd86744 2019-08-12 anthony The patch can be mailed out for review and applied to
2188 1dd86744 2019-08-12 anthony .Ox Ns 's
2189 1dd86744 2019-08-12 anthony CVS tree:
2191 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
2193 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
2194 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
2197 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
2198 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
2199 0ebf8283 2019-07-24 stsp .Dl $ got histedit
2201 bf390dec 2020-03-20 stsp In order to merge changes committed to the
2202 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2203 bf390dec 2020-03-20 stsp branch back into the
2204 bf390dec 2020-03-20 stsp .Dq master
2205 bf390dec 2020-03-20 stsp branch, the
2206 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2207 bf390dec 2020-03-20 stsp branch must first be rebased onto the
2208 bf390dec 2020-03-20 stsp .Dq master
2211 bf390dec 2020-03-20 stsp .Dl $ got update -b master
2212 bf390dec 2020-03-20 stsp .Dl $ got rebase unified-buffer-cache
2214 bf390dec 2020-03-20 stsp Changes on the
2215 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2216 bf390dec 2020-03-20 stsp branch can now be made visible on the
2217 bf390dec 2020-03-20 stsp .Dq master
2218 bf390dec 2020-03-20 stsp branch with
2219 bf390dec 2020-03-20 stsp .Cm got integrate .
2220 bf390dec 2020-03-20 stsp Because the rebase operation switched the work tree to the
2221 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2222 bf390dec 2020-03-20 stsp branch, the work tree must be switched back to the
2223 bf390dec 2020-03-20 stsp .Dq master
2224 bf390dec 2020-03-20 stsp branch before the
2225 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2226 bf390dec 2020-03-20 stsp branch can be integrated into
2227 bf390dec 2020-03-20 stsp .Dq master :
2229 bf390dec 2020-03-20 stsp .Dl $ got update -b master
2230 bf390dec 2020-03-20 stsp .Dl $ got integrate unified-buffer-cache
2232 469dd726 2020-03-20 stsp Additional steps may be necessary if local changes need to be pushed back
2233 7b3fde24 2019-07-28 stsp to the remote repository, which currently requires
2234 7b3fde24 2019-07-28 stsp .Cm git push .
2235 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
2236 469dd726 2020-03-20 stsp .Cm git clone --bare
2237 7848a0e1 2020-03-19 stsp instead of
2238 7848a0e1 2020-03-19 stsp .Cm got clone ,
2240 ff2cf171 2019-07-28 stsp .Dq refspec
2241 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
2243 ff2cf171 2019-07-28 stsp .Dq refs/remotes
2244 ff2cf171 2019-07-28 stsp namespace of the local repository.
2245 ff2cf171 2019-07-28 stsp This can achieved by setting Git's
2246 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
2247 ff2cf171 2019-07-28 stsp configuration variable to the value
2248 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
2250 ff2cf171 2019-07-28 stsp .Cm git config
2253 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2254 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
2256 469dd726 2020-03-20 stsp Additionally, the
2257 469dd726 2020-03-20 stsp .Dq mirror
2258 469dd726 2020-03-20 stsp option must be disabled:
2260 469dd726 2020-03-20 stsp .Dl $ cd /var/git/repo
2261 469dd726 2020-03-20 stsp .Dl $ git config remote.origin.mirror false
2263 ff2cf171 2019-07-28 stsp Alternatively, the following
2264 469dd726 2020-03-20 stsp .Xr git-fetch 1
2265 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
2266 ff2cf171 2019-07-28 stsp .Pa config
2269 ff2cf171 2019-07-28 stsp .Dl [remote "origin"]
2270 ff2cf171 2019-07-28 stsp .Dl url = ...
2271 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
2272 469dd726 2020-03-20 stsp .Dl mirror = false
2274 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
2275 ff2cf171 2019-07-28 stsp .Dq refs/heads
2276 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
2277 ff2cf171 2019-07-28 stsp .Cm got checkout
2278 ff2cf171 2019-07-28 stsp and, if needed, created with
2279 ff2cf171 2019-07-28 stsp .Cm got branch .
2281 ff2cf171 2019-07-28 stsp Branches in the
2282 ff2cf171 2019-07-28 stsp .Dq remotes/origin
2283 469dd726 2020-03-20 stsp namespace can now be updated with incoming changes from the remote
2284 ff2cf171 2019-07-28 stsp repository with
2285 469dd726 2020-03-20 stsp .Cm got fetch
2287 469dd726 2020-03-20 stsp .Xr git-fetch 1
2288 469dd726 2020-03-20 stsp without extra command line arguments:
2290 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2291 469dd726 2020-03-20 stsp .Dl $ git fetch
2293 7b0db533 2020-02-04 stsp To make changes fetched from the remote repository appear on the
2294 ff2cf171 2019-07-28 stsp .Dq master
2295 7b0db533 2020-02-04 stsp branch, the
2296 ff2cf171 2019-07-28 stsp .Dq master
2297 ff2cf171 2019-07-28 stsp branch must be rebased onto the
2298 ff2cf171 2019-07-28 stsp .Dq origin/master
2300 7b0db533 2020-02-04 stsp This will also merge local changes, if any, with the incoming changes:
2302 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
2303 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
2306 083957f4 2020-02-24 stsp .Dq master
2307 083957f4 2020-02-24 stsp branch, log messages for local changes can now be amended with
2309 083957f4 2020-02-24 stsp by other developers and any other important new information:
2311 083957f4 2020-02-24 stsp .Dl $ got update -c origin/master
2312 083957f4 2020-02-24 stsp .Dl $ got histedit -m
2314 7b0db533 2020-02-04 stsp Local changes on the
2315 ff2cf171 2019-07-28 stsp .Dq master
2316 ff2cf171 2019-07-28 stsp branch can then be pushed to the remote
2317 ff2cf171 2019-07-28 stsp repository with
2318 ff2cf171 2019-07-28 stsp .Cm git push :
2320 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2321 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
2322 5c860e29 2018-03-12 stsp .Sh SEE ALSO
2323 2312fc47 2019-07-15 stsp .Xr tog 1 ,
2324 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
2325 257add31 2020-09-09 stsp .Xr got-worktree 5 ,
2326 257add31 2020-09-09 stsp .Xr got.conf 5
2327 1a208aaf 2018-04-01 stsp .Sh AUTHORS
2328 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
2329 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
2330 bc3056e3 2019-08-18 stsp .An Joshua Stein Aq Mt jcs@openbsd.org
2331 83b416ed 2020-03-18 stsp .An Ori Bernstein Aq Mt ori@openbsd.org
2332 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
2334 cc63216e 2020-12-26 stsp is a work-in-progress and some features remain to be implemented.
2336 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
2338 cc63216e 2020-12-26 stsp to perform some tasks.
2339 cc63216e 2020-12-26 stsp In particular:
2340 cc63216e 2020-12-26 stsp .Bl -bullet
2342 cc63216e 2020-12-26 stsp Reading from remote repositories over HTTP or HTTPS protocols requires
2343 cc63216e 2020-12-26 stsp .Xr git-clone 1
2345 cc63216e 2020-12-26 stsp .Xr git-fetch 1 .
2347 cc63216e 2020-12-26 stsp Writing to remote repositories, over any protocol, requires
2348 cc63216e 2020-12-26 stsp .Xr git-push 1 .
2350 cc63216e 2020-12-26 stsp Packing repositories, which reduces disk space consumption and improves
2351 cc63216e 2020-12-26 stsp read-access performance, requires
2352 cc63216e 2020-12-26 stsp .Xr git-repack 1 .
2354 cc63216e 2020-12-26 stsp Exporting data from repositories requires
2355 cc63216e 2020-12-26 stsp .Xr git-fast-export 1 .
2357 cc63216e 2020-12-26 stsp Importing data into repositories requires
2358 cc63216e 2020-12-26 stsp .Xr git-fast-import 1 .
2360 cc63216e 2020-12-26 stsp Reducing the size of repositories by removing redundant or unreferenced
2361 cc63216e 2020-12-26 stsp data requires
2362 cc63216e 2020-12-26 stsp .Xr git-gc 1 .
2364 cc63216e 2020-12-26 stsp The creation of merge commits, i.e. commits with two or more parent commits,
2366 cc63216e 2020-12-26 stsp .Xr git-merge 1 .
2368 cc63216e 2020-12-26 stsp In situations where files or directories were moved around
2370 cc63216e 2020-12-26 stsp will not automatically merge changes to new locations and
2372 cc63216e 2020-12-26 stsp will usually produce better results.
