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 1795b260 2021-04-02 kn .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
199 99495ddb 2021-01-10 stsp .Ar reference
200 132af4a5 2021-01-05 stsp arguments for future use by
201 7848a0e1 2020-03-19 stsp .Cm got fetch
203 7848a0e1 2020-03-19 stsp .Xr git-fetch 1 .
205 2ab43947 2020-03-18 stsp The options for
206 2ab43947 2020-03-18 stsp .Cm got clone
207 2ab43947 2020-03-18 stsp are as follows:
208 2ab43947 2020-03-18 stsp .Bl -tag -width Ds
210 1d4b192f 2020-03-21 stsp Fetch all branches from the remote repository's
211 1d4b192f 2020-03-21 stsp .Dq refs/heads/
212 5aa20203 2021-01-05 stsp reference namespace and set
213 5aa20203 2021-01-05 stsp .Cm fetch-all-branches
214 5aa20203 2021-01-05 stsp in the cloned repository's
215 5aa20203 2021-01-05 stsp .Xr got.conf 5
216 5aa20203 2021-01-05 stsp file for future use by
217 5aa20203 2021-01-05 stsp .Cm got fetch .
218 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
219 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
220 4ba14133 2020-03-20 stsp Cannot be used together with the
223 4ba14133 2020-03-20 stsp .It Fl b Ar branch
224 4ba14133 2020-03-20 stsp Fetch the specified
226 1d4b192f 2020-03-21 stsp from the remote repository's
227 1d4b192f 2020-03-21 stsp .Dq refs/heads/
228 1d4b192f 2020-03-21 stsp reference namespace.
229 4ba14133 2020-03-20 stsp This option may be specified multiple times to build a list of branches
231 4ba14133 2020-03-20 stsp If the branch corresponding to the remote repository's HEAD reference is not
232 4ba14133 2020-03-20 stsp in this list, the cloned repository's HEAD reference will be set to the first
233 4ba14133 2020-03-20 stsp branch which was fetched.
234 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
235 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
236 4ba14133 2020-03-20 stsp Cannot be used together with the
240 a18cccf9 2020-03-21 stsp List branches and tags available for fetching from the remote repository
241 41b0de12 2020-03-21 stsp and exit immediately.
242 41b0de12 2020-03-21 stsp Cannot be used together with any of the other options except
247 469dd726 2020-03-20 stsp Create the cloned repository as a mirror of the original repository.
248 469dd726 2020-03-20 stsp This is useful if the cloned repository will not be used to store
249 bd81cfb7 2020-04-19 stsp locally created commits.
251 469dd726 2020-03-20 stsp The repository's
252 257add31 2020-09-09 stsp .Xr got.conf 5
255 257add31 2020-09-09 stsp files will be set up with the
257 469dd726 2020-03-20 stsp option enabled, such that
258 469dd726 2020-03-20 stsp .Cm got fetch
260 469dd726 2020-03-20 stsp .Xr git-fetch 1
261 bd81cfb7 2020-04-19 stsp will write incoming changes directly to branches in the
262 469dd726 2020-03-20 stsp .Dq refs/heads/
263 469dd726 2020-03-20 stsp reference namespace, rather than to branches in the
264 469dd726 2020-03-20 stsp .Dq refs/remotes/
266 469dd726 2020-03-20 stsp This avoids the usual requirement of having to run
267 469dd726 2020-03-20 stsp .Cm got rebase
269 469dd726 2020-03-20 stsp .Cm got fetch
270 bd81cfb7 2020-04-19 stsp in order to make incoming changes appear on branches in the
271 bd81cfb7 2020-04-19 stsp .Dq refs/heads/
273 bd81cfb7 2020-04-19 stsp But maintaining custom changes in the cloned repository becomes difficult
274 bd81cfb7 2020-04-19 stsp since such changes will be at risk of being discarded whenever incoming
275 498ef124 2020-03-21 stsp changes are fetched.
277 2ab43947 2020-03-18 stsp Suppress progress reporting output.
278 2ab43947 2020-03-18 stsp The same option will be passed to
280 2ab43947 2020-03-18 stsp if applicable.
282 2690194b 2020-03-21 stsp Verbose mode.
284 2690194b 2020-03-21 stsp .Cm got clone
285 2690194b 2020-03-21 stsp to print debugging messages to standard error output.
286 2690194b 2020-03-21 stsp This option will be passed to
288 2ab43947 2020-03-18 stsp if applicable.
289 2ab43947 2020-03-18 stsp Multiple -v options increase the verbosity.
290 2ab43947 2020-03-18 stsp The maximum is 3.
291 0e4002ca 2020-03-21 stsp .It Fl R Ar reference
292 0e4002ca 2020-03-21 stsp In addition to the branches and tags that will be fetched, fetch an arbitrary
293 0e4002ca 2020-03-21 stsp .Ar reference
294 0e4002ca 2020-03-21 stsp from the remote repository's
297 0e4002ca 2020-03-21 stsp This option may be specified multiple times to build a list of additional
298 0e4002ca 2020-03-21 stsp references to fetch.
299 71f12362 2020-03-21 stsp The specified
300 71f12362 2020-03-21 stsp .Ar reference
301 a18cccf9 2020-03-21 stsp may either be a path to a specific reference, or a reference namespace
302 71f12362 2020-03-21 stsp which will cause all references in this namespace to be fetched.
304 71f12362 2020-03-21 stsp Each reference will be mapped into the cloned repository's
305 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
306 0e4002ca 2020-03-21 stsp namespace, unless the
308 0e4002ca 2020-03-21 stsp option is used to mirror references directly into the cloned repository's
312 0e4002ca 2020-03-21 stsp .Cm got clone
313 0e4002ca 2020-03-21 stsp will refuse to fetch references from the remote repository's
314 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
316 0e4002ca 2020-03-21 stsp .Dq refs/got/
320 267fe567 2020-03-18 stsp Short alias for
321 267fe567 2020-03-18 stsp .Cm clone .
322 161728eb 2021-07-24 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 Oo Fl X Oc Op Ar remote-repository
323 7848a0e1 2020-03-19 stsp Fetch new changes from a remote repository.
325 4ba14133 2020-03-20 stsp .Ar remote-repository
326 4ba14133 2020-03-20 stsp is specified,
328 7848a0e1 2020-03-19 stsp will be used.
329 50b0790e 2020-09-11 stsp The remote repository's URL is obtained from the corresponding entry in
330 257add31 2020-09-09 stsp .Xr got.conf 5
333 f8ab0c60 2020-03-20 stsp file of the local repository, as created by
334 7848a0e1 2020-03-19 stsp .Cm got clone .
336 89c3c67b 2020-03-20 stsp New changes will be stored in a separate pack file downloaded from the server.
337 89c3c67b 2020-03-20 stsp Optionally, separate pack files stored in the repository can be combined with
338 89c3c67b 2020-03-20 stsp .Xr git-repack 1 .
340 498ef124 2020-03-21 stsp By default, branch references in the
341 7848a0e1 2020-03-19 stsp .Dq refs/remotes/
342 498ef124 2020-03-21 stsp reference namespace will be updated to point at the newly fetched commits.
344 498ef124 2020-03-21 stsp .Cm got rebase
345 bd81cfb7 2020-04-19 stsp command can then be used to make new changes visible on branches in the
346 7848a0e1 2020-03-19 stsp .Dq refs/heads/
347 bd81cfb7 2020-04-19 stsp namespace, merging incoming changes with the changes on those branches
348 bd81cfb7 2020-04-19 stsp as necessary.
350 498ef124 2020-03-21 stsp If the repository was created as a mirror with
351 498ef124 2020-03-21 stsp .Cm got clone -m
352 498ef124 2020-03-21 stsp then all branches in the
353 469dd726 2020-03-20 stsp .Dq refs/heads/
354 498ef124 2020-03-21 stsp namespace will be updated directly to match the corresponding branches in
355 498ef124 2020-03-21 stsp the remote repository.
356 175367bd 2020-03-20 stsp If those branches contained local commits, these commits will no longer be
357 175367bd 2020-03-20 stsp reachable via a reference and will therefore be at risk of being discarded
358 e6786710 2021-07-03 stsp by Git's garbage collector or
359 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
360 bd81cfb7 2020-04-19 stsp Maintaining custom changes in a mirror repository is therefore discouraged.
362 db6d8ad8 2020-03-21 stsp In any case, references in the
363 7848a0e1 2020-03-19 stsp .Dq refs/tags/
364 db6d8ad8 2020-03-21 stsp namespace will always be fetched and mapped directly to local references
365 db6d8ad8 2020-03-21 stsp in the same namespace.
367 7848a0e1 2020-03-19 stsp The options for
368 7848a0e1 2020-03-19 stsp .Cm got fetch
369 7848a0e1 2020-03-19 stsp are as follows:
370 7848a0e1 2020-03-19 stsp .Bl -tag -width Ds
372 1d4b192f 2020-03-21 stsp Fetch all branches from the remote repository's
373 1d4b192f 2020-03-21 stsp .Dq refs/heads/
374 1d4b192f 2020-03-21 stsp reference namespace.
375 0c8b29c5 2021-01-05 stsp This option can be enabled by default for specific repositories in
376 0c8b29c5 2021-01-05 stsp .Xr got.conf 5 .
377 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
378 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
379 4ba14133 2020-03-20 stsp Cannot be used together with the
382 4ba14133 2020-03-20 stsp .It Fl b Ar branch
383 4ba14133 2020-03-20 stsp Fetch the specified
385 1d4b192f 2020-03-21 stsp from the remote repository's
386 1d4b192f 2020-03-21 stsp .Dq refs/heads/
387 1d4b192f 2020-03-21 stsp reference namespace.
388 4ba14133 2020-03-20 stsp This option may be specified multiple times to build a list of branches
390 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
391 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
392 4ba14133 2020-03-20 stsp Cannot be used together with the
396 f21ec2f0 2020-03-21 stsp Delete branches and tags from the local repository which are no longer
397 f21ec2f0 2020-03-21 stsp present in the remote repository.
398 f21ec2f0 2020-03-21 stsp Only references are deleted.
399 239821eb 2020-03-21 stsp Any commit, tree, tag, and blob objects belonging to deleted branches or
400 f21ec2f0 2020-03-21 stsp tags remain in the repository and may be removed separately with
401 e6786710 2021-07-03 stsp Git's garbage collector or
402 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
404 41b0de12 2020-03-21 stsp List branches and tags available for fetching from the remote repository
405 41b0de12 2020-03-21 stsp and exit immediately.
406 41b0de12 2020-03-21 stsp Cannot be used together with any of the other options except
412 db6d8ad8 2020-03-21 stsp Allow existing references in the
413 db6d8ad8 2020-03-21 stsp .Dq refs/tags
414 db6d8ad8 2020-03-21 stsp namespace to be updated if they have changed on the server.
415 db6d8ad8 2020-03-21 stsp If not specified, only new tag references will be created.
416 7848a0e1 2020-03-19 stsp .It Fl r Ar repository-path
417 7848a0e1 2020-03-19 stsp Use the repository at the specified path.
418 7848a0e1 2020-03-19 stsp If not specified, assume the repository is located at or above the current
419 7848a0e1 2020-03-19 stsp working directory.
420 7848a0e1 2020-03-19 stsp If this directory is a
422 7848a0e1 2020-03-19 stsp work tree, use the repository path associated with this work tree.
424 7848a0e1 2020-03-19 stsp Suppress progress reporting output.
425 7848a0e1 2020-03-19 stsp The same option will be passed to
427 7848a0e1 2020-03-19 stsp if applicable.
429 2690194b 2020-03-21 stsp Verbose mode.
431 2690194b 2020-03-21 stsp .Cm got fetch
432 2690194b 2020-03-21 stsp to print debugging messages to standard error output.
433 7848a0e1 2020-03-19 stsp The same option will be passed to
435 7848a0e1 2020-03-19 stsp if applicable.
436 7848a0e1 2020-03-19 stsp Multiple -v options increase the verbosity.
437 7848a0e1 2020-03-19 stsp The maximum is 3.
438 0e4002ca 2020-03-21 stsp .It Fl R Ar reference
439 0e4002ca 2020-03-21 stsp In addition to the branches and tags that will be fetched, fetch an arbitrary
440 0e4002ca 2020-03-21 stsp .Ar reference
441 0e4002ca 2020-03-21 stsp from the remote repository's
444 0e4002ca 2020-03-21 stsp This option may be specified multiple times to build a list of additional
445 0e4002ca 2020-03-21 stsp references to fetch.
446 71f12362 2020-03-21 stsp The specified
447 71f12362 2020-03-21 stsp .Ar reference
448 a18cccf9 2020-03-21 stsp may either be a path to a specific reference, or a reference namespace
449 71f12362 2020-03-21 stsp which will cause all references in this namespace to be fetched.
451 0e4002ca 2020-03-21 stsp Each reference will be mapped into the local repository's
452 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
453 0e4002ca 2020-03-21 stsp namespace, unless the local repository was created as a mirror with
454 a18cccf9 2020-03-21 stsp .Cm got clone -m
455 a18cccf9 2020-03-21 stsp in which case references will be mapped directly into the local repository's
459 bd81cfb7 2020-04-19 stsp Once a reference has been fetched, a branch based on it can be created with
460 0e4002ca 2020-03-21 stsp .Cm got branch
463 0e4002ca 2020-03-21 stsp .Cm got fetch
464 0e4002ca 2020-03-21 stsp will refuse to fetch references from the remote repository's
465 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
467 0e4002ca 2020-03-21 stsp .Dq refs/got/
470 161728eb 2021-07-24 stsp Delete all references which correspond to a particular
471 161728eb 2021-07-24 stsp .Ar remote-repository
472 161728eb 2021-07-24 stsp instead of fetching new changes.
473 161728eb 2021-07-24 stsp This can be useful when a remote repository is being removed from
474 161728eb 2021-07-24 stsp .Xr got.conf 5 .
479 161728eb 2021-07-24 stsp .Ar remote-repository
480 161728eb 2021-07-24 stsp argument is mandatory and no other options except
485 161728eb 2021-07-24 stsp are allowed.
487 161728eb 2021-07-24 stsp Only references are deleted.
488 161728eb 2021-07-24 stsp Any commit, tree, tag, and blob objects fetched from a remote repository
489 161728eb 2021-07-24 stsp will generally be stored in pack files and may be removed separately with
490 161728eb 2021-07-24 stsp .Xr git-repack 1
491 161728eb 2021-07-24 stsp and Git's garbage collector.
494 7848a0e1 2020-03-19 stsp Short alias for
495 7848a0e1 2020-03-19 stsp .Cm fetch .
496 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
497 0bb8a95e 2018-03-12 stsp Copy files from a repository into a new work tree.
498 bb51a5b4 2020-01-13 stsp Show the status of each affected file, using the following status codes:
499 bb51a5b4 2020-01-13 stsp .Bl -column YXZ description
500 bb51a5b4 2020-01-13 stsp .It A Ta new file was added
501 bb51a5b4 2020-01-13 stsp .It E Ta file already exists in work tree's meta-data
505 5d7c1dab 2018-04-01 stsp .Ar work tree path
506 c844a238 2019-02-06 stsp is not specified, either use the last component of
507 5d7c1dab 2018-04-01 stsp .Ar repository path ,
509 5d7c1dab 2018-04-01 stsp .Ar path prefix
510 c844a238 2019-02-06 stsp was specified use the last component of
511 5d7c1dab 2018-04-01 stsp .Ar path prefix .
513 38e11793 2018-06-13 stsp The options for
514 38e11793 2018-06-13 stsp .Cm got checkout
515 38e11793 2018-06-13 stsp are as follows:
516 38e11793 2018-06-13 stsp .Bl -tag -width Ds
518 bb51a5b4 2020-01-13 stsp Proceed with the checkout operation even if the directory at
519 bb51a5b4 2020-01-13 stsp .Ar work-tree-path
520 bb51a5b4 2020-01-13 stsp is not empty.
521 bb51a5b4 2020-01-13 stsp Existing files will be left intact.
522 08573d5b 2019-05-14 stsp .It Fl b Ar branch
523 3c575567 2019-07-28 stsp Check out files from a commit on the specified
524 08573d5b 2019-05-14 stsp .Ar branch .
525 08573d5b 2019-05-14 stsp If this option is not specified, a branch resolved via the repository's HEAD
526 08573d5b 2019-05-14 stsp reference will be used.
527 8069f636 2019-01-12 stsp .It Fl c Ar commit
528 8069f636 2019-01-12 stsp Check out files from the specified
530 3c575567 2019-07-28 stsp on the selected branch.
531 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
532 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
533 0e1b0230 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
534 0e1b0230 2019-07-07 stsp automatically, provided the abbreviation is unique.
535 08573d5b 2019-05-14 stsp If this option is not specified, the most recent commit on the selected
536 08573d5b 2019-05-14 stsp branch will be used.
538 4b6c9460 2020-03-05 stsp If the specified
540 4b6c9460 2020-03-05 stsp is not contained in the selected branch, a different branch which contains
541 4b6c9460 2020-03-05 stsp this commit must be specified with the
544 4b6c9460 2020-03-05 stsp If no such branch is known a new branch must be created for this
545 4b6c9460 2020-03-05 stsp commit with
546 4b6c9460 2020-03-05 stsp .Cm got branch
548 4b6c9460 2020-03-05 stsp .Cm got checkout
549 4b6c9460 2020-03-05 stsp can be used.
550 4b6c9460 2020-03-05 stsp Checking out work trees with an unknown branch is intentionally not supported.
551 38e11793 2018-06-13 stsp .It Fl p Ar path-prefix
552 38e11793 2018-06-13 stsp Restrict the work tree to a subset of the repository's tree hierarchy.
553 38e11793 2018-06-13 stsp Only files beneath the specified
554 38e11793 2018-06-13 stsp .Ar path-prefix
555 38e11793 2018-06-13 stsp will be checked out.
558 97b3a7be 2019-07-09 stsp Short alias for
559 97b3a7be 2019-07-09 stsp .Cm checkout .
560 dfc23429 2019-08-11 stsp .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Op Ar path ...
561 4f331d3a 2020-04-01 stsp Update an existing work tree to a different
562 4f331d3a 2020-04-01 stsp .Ar commit .
563 4f331d3a 2020-04-01 stsp Change existing files in the work tree as necessary to match file contents
564 4f331d3a 2020-04-01 stsp of this commit.
565 4f331d3a 2020-04-01 stsp Preserve any local changes in the work tree and merge them with the
566 4f331d3a 2020-04-01 stsp incoming changes.
568 5036ab18 2020-04-18 stsp Files which already contain merge conflicts will not be updated to avoid
569 5036ab18 2020-04-18 stsp further complications.
570 5036ab18 2020-04-18 stsp Such files will be updated when
571 5036ab18 2020-04-18 stsp .Cm got update
572 5036ab18 2020-04-18 stsp is run again after merge conflicts have been resolved.
573 5036ab18 2020-04-18 stsp If the conflicting changes are no longer needed affected files can be
574 5036ab18 2020-04-18 stsp reverted with
575 5036ab18 2020-04-18 stsp .Cm got revert
576 5036ab18 2020-04-18 stsp before running
577 5036ab18 2020-04-18 stsp .Cm got update
580 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
581 7f838b36 2019-02-08 stsp .Bl -column YXZ description
582 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
583 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
584 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
585 7f838b36 2019-02-08 stsp .It D Ta file was deleted
586 7f838b36 2019-02-08 stsp .It A Ta new file was added
587 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
588 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
589 5036ab18 2020-04-18 stsp .It # Ta file was not updated because it contains merge conflicts
590 3b9f0f87 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
595 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
596 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
597 f2ea84fa 2019-07-27 stsp specified paths.
598 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
599 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
600 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
603 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
604 c4cdcb68 2019-04-03 stsp multiple base commits.
605 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
606 47ec7be7 2019-05-12 stsp .Cm got update
607 47ec7be7 2019-05-12 stsp across the entire work tree.
608 024e9686 2019-05-14 stsp Specifying a
610 024e9686 2019-05-14 stsp is incompatible with the
614 4ed9f614 2019-08-04 stsp .Cm got update
615 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
616 4ed9f614 2019-08-04 stsp If changes have been staged with
617 4ed9f614 2019-08-04 stsp .Cm got stage ,
618 bc3056e3 2019-08-18 stsp these changes must first be committed with
619 4ed9f614 2019-08-04 stsp .Cm got commit
620 4ed9f614 2019-08-04 stsp or unstaged with
621 4ed9f614 2019-08-04 stsp .Cm got unstage .
623 507dc3bb 2018-12-29 stsp The options for
624 507dc3bb 2018-12-29 stsp .Cm got update
625 507dc3bb 2018-12-29 stsp are as follows:
626 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
627 024e9686 2019-05-14 stsp .It Fl b Ar branch
628 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
630 024e9686 2019-05-14 stsp before updating the work tree.
631 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
633 4f331d3a 2020-04-01 stsp As usual, any local changes in the work tree will be preserved.
634 4f331d3a 2020-04-01 stsp This can be useful when switching to a newly created branch in order
635 4f331d3a 2020-04-01 stsp to commit existing local changes to this branch.
637 4f331d3a 2020-04-01 stsp Any local changes must be dealt with separately in order to obtain a
638 4f331d3a 2020-04-01 stsp work tree with pristine file contents corresponding exactly to the specified
639 4f331d3a 2020-04-01 stsp .Ar branch .
640 4f331d3a 2020-04-01 stsp Such changes could first be committed to a different branch with
641 4f331d3a 2020-04-01 stsp .Cm got commit ,
642 4f331d3a 2020-04-01 stsp or could be discarded with
643 4f331d3a 2020-04-01 stsp .Cm got revert .
644 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
645 507dc3bb 2018-12-29 stsp Update the work tree to the specified
646 507dc3bb 2018-12-29 stsp .Ar commit .
647 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
648 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
649 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
650 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
651 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
652 024e9686 2019-05-14 stsp branch will be used.
655 97b3a7be 2019-07-09 stsp Short alias for
656 97b3a7be 2019-07-09 stsp .Cm update .
657 3217be6d 2021-06-22 stsp .It Cm status Oo Fl I Oc Oo Fl s Ar status-codes Oc Op Ar path ...
658 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
659 6bad629b 2019-02-04 stsp using the following status codes:
660 6bad629b 2019-02-04 stsp .Bl -column YXZ description
661 6bad629b 2019-02-04 stsp .It M Ta modified file
662 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
663 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
664 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
665 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
666 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
667 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
669 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
670 2a06fe5f 2019-08-24 stsp .It N Ta non-existent
672 2a06fe5f 2019-08-24 stsp specified on the command line
677 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
678 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
680 4ed9f614 2019-08-04 stsp If changes have been staged with
681 4ed9f614 2019-08-04 stsp .Cm got stage ,
682 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
683 4ed9f614 2019-08-04 stsp status codes:
684 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
685 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
686 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
687 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
690 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
691 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
692 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
693 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
696 081470ac 2020-08-13 stsp The options for
697 081470ac 2020-08-13 stsp .Cm got status
698 081470ac 2020-08-13 stsp are as follows:
699 081470ac 2020-08-13 stsp .Bl -tag -width Ds
701 f6343036 2021-06-22 stsp Show unversioned files even if they match an ignore pattern.
702 081470ac 2020-08-13 stsp .It Fl s Ar status-codes
703 081470ac 2020-08-13 stsp Only show files with a modification status matching any of the
704 081470ac 2020-08-13 stsp single-character status codes contained in the
705 081470ac 2020-08-13 stsp .Ar status-codes
707 081470ac 2020-08-13 stsp Any combination of codes from the above list of possible status codes
708 081470ac 2020-08-13 stsp may be specified.
709 081470ac 2020-08-13 stsp For staged files, status codes displayed in either column will be matched.
712 6841da00 2019-08-08 stsp For compatibility with
715 bd8de430 2019-10-04 stsp .Xr git 1 ,
716 6841da00 2019-08-08 stsp .Cm got status
719 bd8de430 2019-10-04 stsp patterns from
720 6841da00 2019-08-08 stsp .Pa .cvsignore
722 bd8de430 2019-10-04 stsp .Pa .gitignore
723 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
724 bd8de430 2019-10-04 stsp which match these patterns.
725 bd8de430 2019-10-04 stsp As an extension to
727 bd8de430 2019-10-04 stsp matching rules,
728 bd8de430 2019-10-04 stsp .Cm got status
729 bd8de430 2019-10-04 stsp supports consecutive asterisks,
731 bd8de430 2019-10-04 stsp which will match an arbitrary amount of directories.
733 6841da00 2019-08-08 stsp .Xr cvs 1 ,
734 6841da00 2019-08-08 stsp .Cm got status
735 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
737 bd8de430 2019-10-04 stsp .Xr git 1 ,
738 bd8de430 2019-10-04 stsp .Cm got status
739 bd8de430 2019-10-04 stsp does not support negated ignore patterns prefixed with
741 bd8de430 2019-10-04 stsp and gives no special significance to the location of path component separators,
743 bd8de430 2019-10-04 stsp in a pattern.
745 97b3a7be 2019-07-09 stsp Short alias for
746 97b3a7be 2019-07-09 stsp .Cm status .
747 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
748 38e11793 2018-06-13 stsp Display history of a repository.
751 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
752 dc990cbf 2020-02-22 stsp If invoked in a work tree, the
754 dc990cbf 2020-02-22 stsp is interpreted relative to the current working directory,
755 dc990cbf 2020-02-22 stsp and the work tree's path prefix is implicitly prepended.
756 dc990cbf 2020-02-22 stsp Otherwise, the path is interpreted relative to the repository root.
758 38e11793 2018-06-13 stsp The options for
759 38e11793 2018-06-13 stsp .Cm got log
760 38e11793 2018-06-13 stsp are as follows:
761 38e11793 2018-06-13 stsp .Bl -tag -width Ds
763 1137e0ae 2020-01-27 stsp Display individual commits which were merged into the current branch
764 1137e0ae 2020-01-27 stsp from other branches.
765 48c8c60d 2020-01-27 stsp By default,
766 48c8c60d 2020-01-27 stsp .Cm got log
767 48c8c60d 2020-01-27 stsp shows the linear history of the current branch only.
768 38e11793 2018-06-13 stsp .It Fl c Ar commit
769 38e11793 2018-06-13 stsp Start traversing history at the specified
770 38e11793 2018-06-13 stsp .Ar commit .
771 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
772 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
773 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
774 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
775 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
776 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
777 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
778 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
780 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
781 6238ee32 2018-06-13 stsp .It Fl l Ar N
782 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
783 b1ebc001 2019-08-13 stsp If this option is not specified, a default limit value of zero is used,
784 b1ebc001 2019-08-13 stsp which is treated as an unbounded limit.
786 b1ebc001 2019-08-13 stsp .Ev GOT_LOG_DEFAULT_LIMIT
787 b1ebc001 2019-08-13 stsp environment variable may be set to change this default value.
789 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
792 44392932 2019-08-25 stsp is specified, only show the patch of modifications at or within this path.
794 0208f208 2020-05-05 stsp Display the list of file paths changed in each commit, using the following
795 0208f208 2020-05-05 stsp status codes:
796 0208f208 2020-05-05 stsp .Bl -column YXZ description
797 0208f208 2020-05-05 stsp .It M Ta modified file
798 0208f208 2020-05-05 stsp .It D Ta file was deleted
799 0208f208 2020-05-05 stsp .It A Ta new file was added
800 0208f208 2020-05-05 stsp .It m Ta modified file modes (executable bit only)
802 c6390436 2019-11-29 kn .It Fl s Ar search-pattern
803 c6390436 2019-11-29 kn If specified, show only commits with a log message matched by the extended
804 6841bf13 2019-11-29 kn regular expression
805 6841bf13 2019-11-29 kn .Ar search-pattern .
806 0208f208 2020-05-05 stsp When used together with
808 0208f208 2020-05-05 stsp then the file paths changed by a commit can be matched as well.
809 6841bf13 2019-11-29 kn Regular expression syntax is documented in
810 6841bf13 2019-11-29 kn .Xr re_format 7 .
811 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
812 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
813 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
814 04ca23f4 2018-07-16 stsp working directory.
815 e9cf2e30 2019-02-05 stsp If this directory is a
817 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
819 dbec59df 2020-04-18 stsp Determine a set of commits to display as usual, but display these commits
820 dbec59df 2020-04-18 stsp in reverse order.
821 d1fe46f9 2020-04-18 stsp .It Fl x Ar commit
822 4e20a648 2021-03-21 jrick Stop traversing commit history immediately after the specified
824 52ab7958 2020-04-18 stsp has been traversed.
825 d1fe46f9 2020-04-18 stsp This option has no effect if the specified
827 d1fe46f9 2020-04-18 stsp is never traversed.
829 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
830 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
831 bd81cfb7 2020-04-19 stsp local changes in the work tree.
834 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
836 d24820bf 2019-08-11 stsp If two arguments are provided, treat each argument as a reference, a tag
837 d24820bf 2019-08-11 stsp name, or an object ID SHA1 hash, and display differences between the
838 d24820bf 2019-08-11 stsp corresponding objects.
839 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
840 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
841 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
843 c0cc5c62 2018-10-18 stsp The options for
844 c0cc5c62 2018-10-18 stsp .Cm got diff
845 c0cc5c62 2018-10-18 stsp are as follows:
846 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
848 64453f7e 2020-11-21 stsp Treat file contents as ASCII text even if binary data is detected.
849 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
850 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
851 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
852 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
853 b72f483a 2019-02-05 stsp Use the repository at the specified path.
854 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
855 b72f483a 2019-02-05 stsp working directory.
856 b72f483a 2019-02-05 stsp If this directory is a
858 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
860 4ed9f614 2019-08-04 stsp Show changes staged with
861 4ed9f614 2019-08-04 stsp .Cm got stage
862 bd81cfb7 2020-04-19 stsp instead of showing local changes in the work tree.
863 4ed9f614 2019-08-04 stsp This option is only valid when
864 4ed9f614 2019-08-04 stsp .Cm got diff
865 4ed9f614 2019-08-04 stsp is invoked in a work tree.
867 63035f9f 2019-10-06 stsp Ignore whitespace-only changes.
870 bc26cce8 2019-08-04 stsp Short alias for
872 dfc23429 2019-08-11 stsp .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
873 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
875 1ff8e573 2018-08-02 stsp The options for
876 1ff8e573 2018-08-02 stsp .Cm got blame
877 1ff8e573 2018-08-02 stsp are as follows:
878 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
879 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
880 1ff8e573 2018-08-02 stsp Start traversing history at the specified
881 1ff8e573 2018-08-02 stsp .Ar commit .
882 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
883 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
884 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
885 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
886 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
887 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
888 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
889 1ff8e573 2018-08-02 stsp working directory.
890 0c06baac 2019-02-05 stsp If this directory is a
892 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
895 bc26cce8 2019-08-04 stsp Short alias for
896 bc26cce8 2019-08-04 stsp .Cm blame .
897 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
898 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
899 5de5890b 2018-10-18 stsp directory path in the repository.
900 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
901 db0c2996 2019-02-10 stsp annotations:
902 db0c2996 2019-02-10 stsp .Bl -column YXZ description
903 848d6979 2019-08-12 stsp .It @ Ta entry is a symbolic link
904 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
905 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
906 63c5ca5d 2019-08-24 stsp .It $ Ta entry is a Git submodule
909 0d6c6ee3 2020-05-20 stsp Symbolic link entries are also annotated with the target path of the link.
913 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
914 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
915 0c849583 2019-02-05 stsp if there is no work tree.
917 5de5890b 2018-10-18 stsp The options for
918 5de5890b 2018-10-18 stsp .Cm got tree
919 5de5890b 2018-10-18 stsp are as follows:
920 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
921 5de5890b 2018-10-18 stsp .It Fl c Ar commit
922 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
923 5de5890b 2018-10-18 stsp .Ar commit .
924 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
925 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
926 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
927 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
928 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
929 5de5890b 2018-10-18 stsp Use the repository at the specified path.
930 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
931 5de5890b 2018-10-18 stsp working directory.
932 0c849583 2019-02-05 stsp If this directory is a
934 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
936 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
938 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
941 bc26cce8 2019-08-04 stsp Short alias for
943 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
944 d0eebce4 2019-03-11 stsp Manage references in a repository.
946 e31abbf2 2020-03-22 stsp References may be listed, created, deleted, and changed.
947 e31abbf2 2020-03-22 stsp When creating, deleting, or changing a reference the specified
949 e31abbf2 2020-03-22 stsp must be an absolute reference name, i.e. it must begin with
950 f16e4044 2019-10-09 stsp .Dq refs/ .
952 d0eebce4 2019-03-11 stsp The options for
953 d0eebce4 2019-03-11 stsp .Cm got ref
954 d0eebce4 2019-03-11 stsp are as follows:
955 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
956 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
957 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
958 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
959 d0eebce4 2019-03-11 stsp working directory.
960 d0eebce4 2019-03-11 stsp If this directory is a
962 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
964 b2070a3f 2020-03-22 stsp List references in the repository.
967 b2070a3f 2020-03-22 stsp is specified, list all existing references in the repository.
970 b2070a3f 2020-03-22 stsp is a reference namespace, list all references in this namespace.
971 b2070a3f 2020-03-22 stsp Otherwise, show only the reference with the given
973 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
975 e31abbf2 2020-03-22 stsp .It Fl c Ar object
976 e31abbf2 2020-03-22 stsp Create a reference or change an existing reference.
977 e31abbf2 2020-03-22 stsp The reference with the specified
979 e31abbf2 2020-03-22 stsp will point at the specified
981 e31abbf2 2020-03-22 stsp The expected
983 e31abbf2 2020-03-22 stsp argument is a ID SHA1 hash or an existing reference or tag name which will
984 e31abbf2 2020-03-22 stsp be resolved to the ID of a corresponding commit, tree, tag, or blob object.
985 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
987 e31abbf2 2020-03-22 stsp .It Fl s Ar reference
988 e31abbf2 2020-03-22 stsp Create a symbolic reference, or change an existing symbolic reference.
989 e31abbf2 2020-03-22 stsp The symbolic reference with the specified
991 e31abbf2 2020-03-22 stsp will point at the specified
992 e31abbf2 2020-03-22 stsp .Ar reference
993 e31abbf2 2020-03-22 stsp which must already exist in the repository.
994 d1c1ae5f 2019-08-12 stsp Care should be taken not to create loops between references when
995 d1c1ae5f 2019-08-12 stsp this option is used.
996 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
999 e31abbf2 2020-03-22 stsp Delete the reference with the specified
1001 e31abbf2 2020-03-22 stsp from the repository.
1002 601aba22 2021-03-21 stsp Any commit, tree, tag, and blob objects belonging to deleted references
1003 601aba22 2021-03-21 stsp remain in the repository and may be removed separately with
1004 e6786710 2021-07-03 stsp Git's garbage collector or
1005 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
1006 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
1009 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
1010 da76fce2 2020-02-24 stsp Create, list, or delete branches.
1012 34d4e04c 2021-02-08 stsp Local branches are managed via references which live in the
1013 4e759de4 2019-06-26 stsp .Dq refs/heads/
1014 4e759de4 2019-06-26 stsp reference namespace.
1016 4e759de4 2019-06-26 stsp .Cm got branch
1017 34d4e04c 2021-02-08 stsp command creates or deletes references in this namespace only.
1019 ad89fa31 2019-10-04 stsp If invoked in a work tree without any arguments, print the name of the
1020 ad89fa31 2019-10-04 stsp work tree's current branch.
1024 a74f7e83 2019-11-10 stsp argument is passed, attempt to create a branch reference with the given name.
1025 a74f7e83 2019-11-10 stsp By default the new branch reference will point at the latest commit on the
1026 a74f7e83 2019-11-10 stsp work tree's current branch if invoked in a work tree, and otherwise to a commit
1027 a74f7e83 2019-11-10 stsp resolved via the repository's HEAD reference.
1029 da76fce2 2020-02-24 stsp If invoked in a work tree, once the branch was created successfully
1030 da76fce2 2020-02-24 stsp switch the work tree's head reference to the newly created branch and
1031 da76fce2 2020-02-24 stsp update files across the entire work tree, just like
1032 da76fce2 2020-02-24 stsp .Cm got update -b Ar name
1034 da76fce2 2020-02-24 stsp Show the status of each affected file, using the following status codes:
1035 da76fce2 2020-02-24 stsp .Bl -column YXZ description
1036 da76fce2 2020-02-24 stsp .It U Ta file was updated and contained no local changes
1037 da76fce2 2020-02-24 stsp .It G Ta file was updated and local changes were merged cleanly
1038 da76fce2 2020-02-24 stsp .It C Ta file was updated and conflicts occurred during merge
1039 da76fce2 2020-02-24 stsp .It D Ta file was deleted
1040 da76fce2 2020-02-24 stsp .It A Ta new file was added
1041 da76fce2 2020-02-24 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
1042 da76fce2 2020-02-24 stsp .It ! Ta a missing versioned file was restored
1045 4e759de4 2019-06-26 stsp The options for
1046 4e759de4 2019-06-26 stsp .Cm got branch
1047 4e759de4 2019-06-26 stsp are as follows:
1048 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
1049 a74f7e83 2019-11-10 stsp .It Fl c Ar commit
1050 a74f7e83 2019-11-10 stsp Make a newly created branch reference point at the specified
1051 a74f7e83 2019-11-10 stsp .Ar commit .
1052 a74f7e83 2019-11-10 stsp The expected
1053 a74f7e83 2019-11-10 stsp .Ar commit
1054 a74f7e83 2019-11-10 stsp argument is a commit ID SHA1 hash or an existing reference
1055 a74f7e83 2019-11-10 stsp or tag name which will be resolved to a commit ID.
1056 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
1057 4e759de4 2019-06-26 stsp Use the repository at the specified path.
1058 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
1059 4e759de4 2019-06-26 stsp working directory.
1060 4e759de4 2019-06-26 stsp If this directory is a
1062 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
1064 34d4e04c 2021-02-08 stsp List all existing branches in the repository, including copies of remote
1065 34d4e04c 2021-02-08 stsp repositories' branches in the
1066 34d4e04c 2021-02-08 stsp .Dq refs/remotes/
1067 34d4e04c 2021-02-08 stsp reference namespace.
1069 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
1070 ba882ee3 2019-07-11 stsp with one the following annotations:
1071 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
1072 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
1073 1dd86744 2019-08-12 anthony .It \(a~ Ta work tree's base commit is out-of-date
1075 4e759de4 2019-06-26 stsp .It Fl d Ar name
1076 4e759de4 2019-06-26 stsp Delete the branch with the specified name from the repository.
1077 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
1078 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
1079 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
1080 e6786710 2021-07-03 stsp Git's garbage collector or
1081 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
1083 da76fce2 2020-02-24 stsp Do not switch and update the work tree after creating a new branch.
1086 97b3a7be 2019-07-09 stsp Short alias for
1087 97b3a7be 2019-07-09 stsp .Cm branch .
1088 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
1089 8e7bd50a 2019-08-22 stsp Manage tags in a repository.
1091 8e7bd50a 2019-08-22 stsp Tags are managed via references which live in the
1092 8e7bd50a 2019-08-22 stsp .Dq refs/tags/
1093 8e7bd50a 2019-08-22 stsp reference namespace.
1095 8e7bd50a 2019-08-22 stsp .Cm got tag
1096 8e7bd50a 2019-08-22 stsp command operates on references in this namespace only.
1097 b3cd068e 2019-08-22 stsp References in this namespace point at tag objects which contain a pointer
1098 b3cd068e 2019-08-22 stsp to another object, a tag message, as well as author and timestamp information.
1100 80106605 2020-02-24 stsp Attempt to create a tag with the given
1101 8e7bd50a 2019-08-22 stsp .Ar name ,
1102 8e7bd50a 2019-08-22 stsp and make this tag point at the given
1103 8e7bd50a 2019-08-22 stsp .Ar commit .
1104 8e7bd50a 2019-08-22 stsp If no commit is specified, default to the latest commit on the work tree's
1105 8e7bd50a 2019-08-22 stsp current branch if invoked in a work tree, and to a commit resolved via
1106 8e7bd50a 2019-08-22 stsp the repository's HEAD reference otherwise.
1108 8e7bd50a 2019-08-22 stsp The options for
1109 8e7bd50a 2019-08-22 stsp .Cm got tag
1110 8e7bd50a 2019-08-22 stsp are as follows:
1111 8e7bd50a 2019-08-22 stsp .Bl -tag -width Ds
1112 80106605 2020-02-24 stsp .It Fl c Ar commit
1113 80106605 2020-02-24 stsp Make the newly created tag reference point at the specified
1114 80106605 2020-02-24 stsp .Ar commit .
1115 80106605 2020-02-24 stsp The expected
1116 80106605 2020-02-24 stsp .Ar commit
1117 80106605 2020-02-24 stsp argument is a commit ID SHA1 hash or an existing reference or tag name which
1118 80106605 2020-02-24 stsp will be resolved to a commit ID.
1119 80106605 2020-02-24 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1120 80106605 2020-02-24 stsp automatically, provided the abbreviation is unique.
1121 8e7bd50a 2019-08-22 stsp .It Fl m Ar message
1122 80106605 2020-02-24 stsp Use the specified tag message when creating the new tag.
1123 8e7bd50a 2019-08-22 stsp Without the
1126 3a62228f 2019-11-08 stsp .Cm got tag
1127 8e7bd50a 2019-08-22 stsp opens a temporary file in an editor where a tag message can be written.
1128 8e7bd50a 2019-08-22 stsp .It Fl r Ar repository-path
1129 8e7bd50a 2019-08-22 stsp Use the repository at the specified path.
1130 8e7bd50a 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1131 8e7bd50a 2019-08-22 stsp working directory.
1132 8e7bd50a 2019-08-22 stsp If this directory is a
1134 8e7bd50a 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1136 8e7bd50a 2019-08-22 stsp List all existing tags in the repository instead of creating a new tag.
1137 8e7bd50a 2019-08-22 stsp If this option is used, no other command-line arguments are allowed.
1140 8e7bd50a 2019-08-22 stsp By design, the
1141 8e7bd50a 2019-08-22 stsp .Cm got tag
1142 8e7bd50a 2019-08-22 stsp command will not delete tags or change existing tags.
1143 8e7bd50a 2019-08-22 stsp If a tag must be deleted, the
1144 8e7bd50a 2019-08-22 stsp .Cm got ref
1145 8e7bd50a 2019-08-22 stsp command may be used to delete a tag's reference.
1146 8e7bd50a 2019-08-22 stsp This should only be done if the tag has not already been copied to
1147 8e7bd50a 2019-08-22 stsp another repository.
1148 022fae89 2019-12-06 tracey .It Cm add Oo Fl R Oc Oo Fl I Oc Ar path ...
1149 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
1150 d00136be 2019-03-26 stsp repository in the next commit.
1151 ff56836b 2021-07-08 stsp By default, files which match a
1152 ff56836b 2021-07-08 stsp .Cm got status
1153 ff56836b 2021-07-08 stsp ignore pattern will not be added.
1155 4e68cba3 2019-11-23 stsp The options for
1156 4e68cba3 2019-11-23 stsp .Cm got add
1157 4e68cba3 2019-11-23 stsp are as follows:
1158 4e68cba3 2019-11-23 stsp .Bl -tag -width Ds
1160 4e68cba3 2019-11-23 stsp Permit recursion into directories.
1161 4e68cba3 2019-11-23 stsp If this option is not specified,
1162 4e68cba3 2019-11-23 stsp .Cm got add
1163 4e68cba3 2019-11-23 stsp will refuse to run if a specified
1165 4e68cba3 2019-11-23 stsp is a directory.
1166 022fae89 2019-12-06 tracey .It Fl I
1167 ff56836b 2021-07-08 stsp Add files even if they match a
1168 022fae89 2019-12-06 tracey .Cm got status
1169 022fae89 2019-12-06 tracey ignore pattern.
1171 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 ...
1172 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
1173 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
1175 2ec1f75b 2019-03-26 stsp The options for
1176 86d25a1b 2019-07-11 stsp .Cm got remove
1177 2ec1f75b 2019-03-26 stsp are as follows:
1178 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
1180 bd81cfb7 2020-04-19 stsp Perform the operation even if a file contains local modifications.
1181 70e3e7f5 2019-12-13 tracey .It Fl k
1182 70e3e7f5 2019-12-13 tracey Keep affected files on disk.
1183 f2a9dc41 2019-12-13 tracey .It Fl R
1184 f2a9dc41 2019-12-13 tracey Permit recursion into directories.
1185 f2a9dc41 2019-12-13 tracey If this option is not specified,
1186 f2a9dc41 2019-12-13 tracey .Cm got remove
1187 f2a9dc41 2019-12-13 tracey will refuse to run if a specified
1188 f2a9dc41 2019-12-13 tracey .Ar path
1189 f2a9dc41 2019-12-13 tracey is a directory.
1190 766841c2 2020-08-13 stsp .It Fl s Ar status-codes
1191 766841c2 2020-08-13 stsp Only delete files with a modification status matching one of the
1192 766841c2 2020-08-13 stsp single-character status codes contained in the
1193 766841c2 2020-08-13 stsp .Ar status-codes
1195 766841c2 2020-08-13 stsp The following status codes may be specified:
1196 766841c2 2020-08-13 stsp .Bl -column YXZ description
1197 766841c2 2020-08-13 stsp .It M Ta modified file (this implies the
1200 766841c2 2020-08-13 stsp .It ! Ta versioned file expected on disk but missing
1204 648e4ef7 2019-07-09 stsp Short alias for
1205 648e4ef7 2019-07-09 stsp .Cm remove .
1206 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 ...
1207 bd81cfb7 2020-04-19 stsp Revert any local changes in files at the specified paths in a work tree.
1208 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
1209 1dd86744 2019-08-12 anthony work tree's base commit.
1210 1dd86744 2019-08-12 anthony There is no way to bring discarded changes back after
1211 a129376b 2019-03-28 stsp .Cm got revert !
1213 e20a8b6f 2019-06-04 stsp If a file was added with
1214 a129376b 2019-03-28 stsp .Cm got add
1215 a129376b 2019-03-28 stsp it will become an unversioned file again.
1216 e20a8b6f 2019-06-04 stsp If a file was deleted with
1217 86d25a1b 2019-07-11 stsp .Cm got remove
1218 a129376b 2019-03-28 stsp it will be restored.
1220 0f6d7415 2019-08-08 stsp The options for
1221 0f6d7415 2019-08-08 stsp .Cm got revert
1222 0f6d7415 2019-08-08 stsp are as follows:
1223 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
1225 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
1226 33aa809d 2019-08-08 stsp changes to revert based on
1228 33aa809d 2019-08-08 stsp (revert change),
1230 33aa809d 2019-08-08 stsp (keep change), and
1232 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
1233 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
1234 33aa809d 2019-08-08 stsp modified file content can be reverted.
1235 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
1236 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
1239 33aa809d 2019-08-08 stsp option, read
1244 33aa809d 2019-08-08 stsp responses line-by-line from the specified
1245 33aa809d 2019-08-08 stsp .Ar response-script
1246 33aa809d 2019-08-08 stsp file instead of prompting interactively.
1248 0f6d7415 2019-08-08 stsp Permit recursion into directories.
1249 0f6d7415 2019-08-08 stsp If this option is not specified,
1250 0f6d7415 2019-08-08 stsp .Cm got revert
1251 0f6d7415 2019-08-08 stsp will refuse to run if a specified
1253 0f6d7415 2019-08-08 stsp is a directory.
1256 97b3a7be 2019-07-09 stsp Short alias for
1257 97b3a7be 2019-07-09 stsp .Cm revert .
1258 28cf319f 2021-01-28 stsp .It Cm commit Oo Fl F Ar path Oc Oo Fl m Ar message Oc Oo Fl N Oc Oo Fl S Oc Op Ar path ...
1259 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
1260 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
1263 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
1264 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
1266 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
1267 1dd86744 2019-08-12 anthony .Cm got stage ,
1268 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
1269 4ed9f614 2019-08-04 stsp have not been staged.
1271 28cf319f 2021-01-28 stsp .Cm got commit
1272 28cf319f 2021-01-28 stsp opens a temporary file in an editor where a log message can be written
1273 28cf319f 2021-01-28 stsp unless the
1275 28cf319f 2021-01-28 stsp option is used
1280 28cf319f 2021-01-28 stsp options are used together.
1282 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
1283 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
1284 15cd91f7 2019-05-12 stsp .It M Ta modified file
1285 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
1286 15cd91f7 2019-05-12 stsp .It A Ta new file was added
1287 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
1290 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
1291 996d5ccd 2019-08-05 stsp recorded base commit.
1294 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
1295 15cd91f7 2019-05-12 stsp multiple base commits.
1296 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
1297 47ec7be7 2019-05-12 stsp .Cm got update
1298 47ec7be7 2019-05-12 stsp across the entire work tree.
1301 15cd91f7 2019-05-12 stsp .Cm got commit
1302 15cd91f7 2019-05-12 stsp command requires the
1303 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
1304 aba9c984 2019-09-08 stsp environment variable to be set,
1305 257add31 2020-09-09 stsp unless an author has been configured in
1306 257add31 2020-09-09 stsp .Xr got.conf 5
1308 aba9c984 2019-09-08 stsp .Dv user.name
1310 709ae9eb 2019-09-08 stsp .Dv user.email
1311 709ae9eb 2019-09-08 stsp configuration settings can be
1312 aba9c984 2019-09-08 stsp obtained from the repository's
1313 aba9c984 2019-09-08 stsp .Pa .git/config
1314 c9956ddf 2019-09-08 stsp file or from Git's global
1315 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1316 c9956ddf 2019-09-08 stsp configuration file.
1318 74416c47 2019-05-09 stsp The options for
1319 74416c47 2019-05-09 stsp .Cm got commit
1320 74416c47 2019-05-09 stsp are as follows:
1321 74416c47 2019-05-09 stsp .Bl -tag -width Ds
1322 28cf319f 2021-01-28 stsp .It Fl F Ar path
1323 28cf319f 2021-01-28 stsp Use the prepared log message stored in the file found at
1325 28cf319f 2021-01-28 stsp when creating the new commit.
1326 28cf319f 2021-01-28 stsp .Cm got commit
1327 28cf319f 2021-01-28 stsp opens a temporary file in an editor where the prepared log message can be
1328 28cf319f 2021-01-28 stsp reviewed and edited further if needed.
1329 28cf319f 2021-01-28 stsp Cannot be used together with the
1332 28cf319f 2021-01-28 stsp .It Fl m Ar message
1333 28cf319f 2021-01-28 stsp Use the specified log message when creating the new commit.
1334 28cf319f 2021-01-28 stsp Cannot be used together with the
1338 28cf319f 2021-01-28 stsp This option prevents
1339 23594da9 2019-05-13 stsp .Cm got commit
1340 28cf319f 2021-01-28 stsp from opening the commit message in an editor.
1341 28cf319f 2021-01-28 stsp It has no effect unless it is used together with the
1343 28cf319f 2021-01-28 stsp option and is intended for non-interactive use such as scripting.
1345 af358f55 2020-07-23 stsp Allow the addition of symbolic links which point outside of the path space
1346 af358f55 2020-07-23 stsp that is under version control.
1347 af358f55 2020-07-23 stsp By default,
1348 af358f55 2020-07-23 stsp .Cm got commit
1349 af358f55 2020-07-23 stsp will reject such symbolic links due to safety concerns.
1350 35213c7c 2020-07-23 stsp As a precaution,
1352 af358f55 2020-07-23 stsp may decide to represent such a symbolic link as a regular file which contains
1353 af358f55 2020-07-23 stsp the link's target path, rather than creating an actual symbolic link which
1354 af358f55 2020-07-23 stsp points outside of the work tree.
1355 af358f55 2020-07-23 stsp Use of this option is discouraged because external mechanisms such as
1356 af358f55 2020-07-23 stsp .Dq make obj
1357 af358f55 2020-07-23 stsp are better suited for managing symbolic links to paths not under
1358 af358f55 2020-07-23 stsp version control.
1361 cfce0458 2019-07-28 stsp .Cm got commit
1362 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
1363 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
1364 916f288c 2019-07-30 stsp .Dq refs/heads/
1365 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
1366 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
1367 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
1368 cfce0458 2019-07-28 stsp If a path is found to be out of date,
1369 cfce0458 2019-07-28 stsp .Cm got update
1370 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
1371 cfce0458 2019-07-28 stsp in the repository.
1373 97b3a7be 2019-07-09 stsp Short alias for
1374 97b3a7be 2019-07-09 stsp .Cm commit .
1375 f8a36e22 2021-08-26 stsp .It Cm send Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl d Ar branch Oc Oo Fl f Oc Oo Fl r Ar repository-path Oc Oo Fl t Ar tag Oc Oo Fl T Oc Oo Fl q Oc Oo Fl v Oc Op Ar remote-repository
1376 f8a36e22 2021-08-26 stsp Send new changes to a remote repository.
1378 f8a36e22 2021-08-26 stsp .Ar remote-repository
1379 f8a36e22 2021-08-26 stsp is specified,
1380 f8a36e22 2021-08-26 stsp .Dq origin
1381 f8a36e22 2021-08-26 stsp will be used.
1382 f8a36e22 2021-08-26 stsp The remote repository's URL is obtained from the corresponding entry in
1383 f8a36e22 2021-08-26 stsp .Xr got.conf 5
1385 f8a36e22 2021-08-26 stsp .Pa config
1386 f8a36e22 2021-08-26 stsp file of the local repository, as created by
1387 f8a36e22 2021-08-26 stsp .Cm got clone .
1389 f8a36e22 2021-08-26 stsp All objects corresponding to new changes will be written to a temporary
1390 f8a36e22 2021-08-26 stsp pack file which is then uploaded to the server.
1391 f8a36e22 2021-08-26 stsp Upon success, references in the
1392 f8a36e22 2021-08-26 stsp .Dq refs/remotes/
1393 f8a36e22 2021-08-26 stsp reference namespace of the local repository will be updated to point at
1394 f8a36e22 2021-08-26 stsp the commits which have been sent.
1396 f8a36e22 2021-08-26 stsp By default, changes will only be sent if they are based on up-to-date
1397 f8a36e22 2021-08-26 stsp copies of relevant branches in the remote repository.
1398 f8a36e22 2021-08-26 stsp If any changes to be sent are based on out-of-date copies, new changes
1399 f8a36e22 2021-08-26 stsp must be fetched from the server with
1400 f8a36e22 2021-08-26 stsp .Cm got fetch
1401 f8a36e22 2021-08-26 stsp and local branches must be rebased with
1402 f8a36e22 2021-08-26 stsp .Cm got rebase
1404 f8a36e22 2021-08-26 stsp .Cm got send
1405 f8a36e22 2021-08-26 stsp can succeed.
1407 f8a36e22 2021-08-26 stsp The options for
1408 f8a36e22 2021-08-26 stsp .Cm got send
1409 f8a36e22 2021-08-26 stsp are as follows:
1410 f8a36e22 2021-08-26 stsp .Bl -tag -width Ds
1412 f8a36e22 2021-08-26 stsp Send all branches from the local repository's
1413 f8a36e22 2021-08-26 stsp .Dq refs/heads/
1414 f8a36e22 2021-08-26 stsp reference namespace.
1417 f8a36e22 2021-08-26 stsp option is equivalent to listing all branches with multiple
1420 f8a36e22 2021-08-26 stsp Cannot be used together with the
1423 f8a36e22 2021-08-26 stsp .It Fl b Ar branch
1424 f8a36e22 2021-08-26 stsp Send the specified
1425 f8a36e22 2021-08-26 stsp .Ar branch
1426 f8a36e22 2021-08-26 stsp from the local repository's
1427 f8a36e22 2021-08-26 stsp .Dq refs/heads/
1428 f8a36e22 2021-08-26 stsp reference namespace.
1429 f8a36e22 2021-08-26 stsp This option may be specified multiple times to build a list of branches
1431 f8a36e22 2021-08-26 stsp If this option is not specified, default to the work tree's current branch
1432 f8a36e22 2021-08-26 stsp if invoked in a work tree, or to the repository's HEAD reference.
1433 f8a36e22 2021-08-26 stsp Cannot be used together with the
1436 f8a36e22 2021-08-26 stsp .It Fl d Ar branch
1437 f8a36e22 2021-08-26 stsp Delete the specified
1438 f8a36e22 2021-08-26 stsp .Ar branch
1439 f8a36e22 2021-08-26 stsp from the remote repository's
1440 f8a36e22 2021-08-26 stsp .Dq refs/heads/
1441 f8a36e22 2021-08-26 stsp reference namespace.
1442 f8a36e22 2021-08-26 stsp This option may be specified multiple times to build a list of branches
1443 f8a36e22 2021-08-26 stsp to delete.
1445 f8a36e22 2021-08-26 stsp Only references are deleted.
1446 f8a36e22 2021-08-26 stsp Any commit, tree, tag, and blob objects belonging to deleted branches
1447 f8a36e22 2021-08-26 stsp may become subject to deletion by Git's garbage collector running on
1448 f8a36e22 2021-08-26 stsp the server.
1450 f8a36e22 2021-08-26 stsp Requesting deletion of branches results in an error if the server
1451 f8a36e22 2021-08-26 stsp does not support this feature.
1453 f8a36e22 2021-08-26 stsp Attempt to force the server to accept uploaded branches or tags in
1454 f8a36e22 2021-08-26 stsp spite of failing client-side sanity checks.
1455 f8a36e22 2021-08-26 stsp The server may reject forced requests regardless, depending on its
1456 f8a36e22 2021-08-26 stsp configuration.
1458 f8a36e22 2021-08-26 stsp Any commit, tree, tag, and blob objects belonging to overwritten branches
1459 f8a36e22 2021-08-26 stsp or tags may become subject to deletion by Git's garbage collector running
1460 f8a36e22 2021-08-26 stsp on the server.
1463 f8a36e22 2021-08-26 stsp .Dq refs/tags
1464 f8a36e22 2021-08-26 stsp reference namespace is globally shared between all repositories.
1465 f8a36e22 2021-08-26 stsp Use of the
1467 f8a36e22 2021-08-26 stsp option to overwrite tags is discouraged because it can lead to
1468 f8a36e22 2021-08-26 stsp inconsistencies between the tags present in different repositories.
1469 f8a36e22 2021-08-26 stsp In general, creating a new tag with a different name is recommended
1470 f8a36e22 2021-08-26 stsp instead of overwriting an existing tag.
1472 f8a36e22 2021-08-26 stsp Use of the
1474 f8a36e22 2021-08-26 stsp option is particularly discouraged if changes being sent are based
1475 f8a36e22 2021-08-26 stsp on an out-of-date copy of a branch in the remote repository.
1476 f8a36e22 2021-08-26 stsp Instead of using the
1478 f8a36e22 2021-08-26 stsp option, new changes should
1479 f8a36e22 2021-08-26 stsp be fetched with
1480 f8a36e22 2021-08-26 stsp .Cm got fetch
1481 f8a36e22 2021-08-26 stsp and local branches should be rebased with
1482 f8a36e22 2021-08-26 stsp .Cm got rebase ,
1483 f8a36e22 2021-08-26 stsp followed by another attempt to send the changes.
1487 f8a36e22 2021-08-26 stsp option should only be needed in situations where the remote repository's
1488 f8a36e22 2021-08-26 stsp copy of a branch or tag is known to be out-of-date and is considered
1489 f8a36e22 2021-08-26 stsp disposable.
1490 f8a36e22 2021-08-26 stsp The risks of creating inconsistencies between different repositories
1491 f8a36e22 2021-08-26 stsp should also be taken into account.
1492 f8a36e22 2021-08-26 stsp .It Fl r Ar repository-path
1493 f8a36e22 2021-08-26 stsp Use the repository at the specified path.
1494 f8a36e22 2021-08-26 stsp If not specified, assume the repository is located at or above the current
1495 f8a36e22 2021-08-26 stsp working directory.
1496 f8a36e22 2021-08-26 stsp If this directory is a
1498 f8a36e22 2021-08-26 stsp work tree, use the repository path associated with this work tree.
1499 f8a36e22 2021-08-26 stsp .It Fl t Ar tag
1500 f8a36e22 2021-08-26 stsp Send the specified
1502 f8a36e22 2021-08-26 stsp from the local repository's
1503 f8a36e22 2021-08-26 stsp .Dq refs/tags/
1504 f8a36e22 2021-08-26 stsp reference namespace, in addition to any branches that are being sent.
1507 f8a36e22 2021-08-26 stsp option may be specified multiple times to build a list of tags to send.
1508 f8a36e22 2021-08-26 stsp No tags will be sent if the
1510 f8a36e22 2021-08-26 stsp option is not used.
1512 f8a36e22 2021-08-26 stsp Raise an error if the specified
1514 f8a36e22 2021-08-26 stsp already exists in the remote repository, unless the
1516 f8a36e22 2021-08-26 stsp option is used to overwrite the sever's copy of the tag.
1517 f8a36e22 2021-08-26 stsp In general, creating a new tag with a different name is recommended
1518 f8a36e22 2021-08-26 stsp instead of overwriting an existing tag.
1520 f8a36e22 2021-08-26 stsp Cannot be used together with the
1524 f8a36e22 2021-08-26 stsp Attempt to send all tags from the local repository's
1525 f8a36e22 2021-08-26 stsp .Dq refs/tags/
1526 f8a36e22 2021-08-26 stsp reference namespace.
1529 f8a36e22 2021-08-26 stsp option is equivalent to listing all tags with multiple
1532 f8a36e22 2021-08-26 stsp Cannot be used together with the
1536 f8a36e22 2021-08-26 stsp Suppress progress reporting output.
1537 f8a36e22 2021-08-26 stsp The same option will be passed to
1539 f8a36e22 2021-08-26 stsp if applicable.
1541 f8a36e22 2021-08-26 stsp Verbose mode.
1543 f8a36e22 2021-08-26 stsp .Cm got send
1544 f8a36e22 2021-08-26 stsp to print debugging messages to standard error output.
1545 f8a36e22 2021-08-26 stsp The same option will be passed to
1547 f8a36e22 2021-08-26 stsp if applicable.
1548 f8a36e22 2021-08-26 stsp Multiple -v options increase the verbosity.
1549 f8a36e22 2021-08-26 stsp The maximum is 3.
1552 f8a36e22 2021-08-26 stsp Short alias for
1553 f8a36e22 2021-08-26 stsp .Cm send .
1554 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
1555 234035bc 2019-06-01 stsp Merge changes from a single
1556 234035bc 2019-06-01 stsp .Ar commit
1557 234035bc 2019-06-01 stsp into the work tree.
1558 234035bc 2019-06-01 stsp The specified
1559 234035bc 2019-06-01 stsp .Ar commit
1560 234035bc 2019-06-01 stsp must be on a different branch than the work tree's base commit.
1561 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
1562 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1563 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
1565 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
1566 234035bc 2019-06-01 stsp .Bl -column YXZ description
1567 234035bc 2019-06-01 stsp .It G Ta file was merged
1568 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
1569 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
1570 234035bc 2019-06-01 stsp .It D Ta file was deleted
1571 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
1572 234035bc 2019-06-01 stsp .It A Ta new file was added
1573 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1574 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1577 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
1578 234035bc 2019-06-01 stsp may be viewed with
1579 234035bc 2019-06-01 stsp .Cm got diff ,
1580 234035bc 2019-06-01 stsp amended manually or with further
1581 234035bc 2019-06-01 stsp .Cm got cherrypick
1583 234035bc 2019-06-01 stsp committed with
1584 234035bc 2019-06-01 stsp .Cm got commit ,
1585 234035bc 2019-06-01 stsp or discarded again with
1586 234035bc 2019-06-01 stsp .Cm got revert .
1588 234035bc 2019-06-01 stsp .Cm got cherrypick
1589 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
1590 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
1591 234035bc 2019-06-01 stsp to a single base commit with
1592 234035bc 2019-06-01 stsp .Cm got update .
1593 234035bc 2019-06-01 stsp If the work tree already contains files with merge conflicts, these
1594 234035bc 2019-06-01 stsp conflicts must be resolved first.
1596 97b3a7be 2019-07-09 stsp Short alias for
1597 97b3a7be 2019-07-09 stsp .Cm cherrypick .
1598 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
1599 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
1600 5ef14e63 2019-06-02 stsp .Ar commit
1601 5ef14e63 2019-06-02 stsp into the work tree.
1602 5ef14e63 2019-06-02 stsp The specified
1603 5ef14e63 2019-06-02 stsp .Ar commit
1604 5ef14e63 2019-06-02 stsp must be on the same branch as the work tree's base commit.
1605 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
1606 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1607 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
1609 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
1610 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
1611 5ef14e63 2019-06-02 stsp .It G Ta file was merged
1612 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
1613 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
1614 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
1615 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
1616 5ef14e63 2019-06-02 stsp .It A Ta new file was added
1617 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1618 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1621 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
1622 5ef14e63 2019-06-02 stsp which may be viewed with
1623 5ef14e63 2019-06-02 stsp .Cm got diff ,
1624 5ef14e63 2019-06-02 stsp amended manually or with further
1625 778a73c2 2019-07-12 stsp .Cm got backout
1627 5ef14e63 2019-06-02 stsp committed with
1628 5ef14e63 2019-06-02 stsp .Cm got commit ,
1629 5ef14e63 2019-06-02 stsp or discarded again with
1630 5ef14e63 2019-06-02 stsp .Cm got revert .
1632 92228c38 2019-06-02 stsp .Cm got backout
1633 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
1634 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
1635 92228c38 2019-06-02 stsp to a single base commit with
1636 92228c38 2019-06-02 stsp .Cm got update .
1637 92228c38 2019-06-02 stsp If the work tree already contains files with merge conflicts, these
1638 92228c38 2019-06-02 stsp conflicts must be resolved first.
1640 97b3a7be 2019-07-09 stsp Short alias for
1641 97b3a7be 2019-07-09 stsp .Cm backout .
1642 643b85bc 2021-07-16 stsp .It Cm rebase Oo Fl a Oc Oo Fl c Oc Oo Fl l Oc Oo Fl X Oc Op Ar branch
1643 818c7501 2019-07-11 stsp Rebase commits on the specified
1644 818c7501 2019-07-11 stsp .Ar branch
1645 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
1647 818c7501 2019-07-11 stsp .Ar branch
1648 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
1649 bc3056e3 2019-08-18 stsp Rebasing begins with the first descendant commit of the youngest
1650 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
1651 818c7501 2019-07-11 stsp .Ar branch
1652 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
1653 f09e2405 2019-07-11 stsp of the specified
1654 818c7501 2019-07-11 stsp .Ar branch
1655 f09e2405 2019-07-11 stsp has been rebased.
1658 2b6826ba 2020-02-24 stsp .Cm got rebase
1659 2b6826ba 2020-02-24 stsp is used as intended, the specified
1660 2b6826ba 2020-02-24 stsp .Ar branch
1661 c10890ce 2020-02-25 stsp represents a local commit history and may already contain changes
1662 c10890ce 2020-02-25 stsp that are not yet visible in any other repositories.
1663 2b6826ba 2020-02-24 stsp The work tree's current branch, which must be set with
1664 2b6826ba 2020-02-24 stsp .Cm got update -b
1665 2b6826ba 2020-02-24 stsp before starting the
1666 2b6826ba 2020-02-24 stsp .Cm rebase
1667 2b6826ba 2020-02-24 stsp operation, represents a branch from a remote repository which shares
1668 2b6826ba 2020-02-24 stsp a common history with the specified
1669 2b6826ba 2020-02-24 stsp .Ar branch
1670 c10890ce 2020-02-25 stsp but has progressed, and perhaps diverged, due to commits added to the
1671 c10890ce 2020-02-25 stsp remote repository.
1673 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
1674 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
1675 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
1676 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
1677 818c7501 2019-07-11 stsp .Ar branch ,
1678 818c7501 2019-07-11 stsp but with different commit IDs.
1679 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
1680 f09e2405 2019-07-11 stsp the new version of the specified
1681 818c7501 2019-07-11 stsp .Ar branch
1682 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
1684 1795b260 2021-04-02 kn Old commits in their pre-rebase state are automatically backed up in the
1685 e600f124 2021-03-21 stsp .Dq refs/got/backup/rebase
1686 e600f124 2021-03-21 stsp reference namespace.
1687 e600f124 2021-03-21 stsp As long as these references are not removed older versions of rebased
1688 e600f124 2021-03-21 stsp commits will remain in the repository and can be viewed with the
1689 e600f124 2021-03-21 stsp .Cm got rebase -l
1691 e600f124 2021-03-21 stsp Removal of these references makes objects which become unreachable via
1692 e6786710 2021-07-03 stsp any reference subject to removal by Git's garbage collector or
1693 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
1695 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
1696 818c7501 2019-07-11 stsp using the following status codes:
1697 818c7501 2019-07-11 stsp .Bl -column YXZ description
1698 818c7501 2019-07-11 stsp .It G Ta file was merged
1699 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
1700 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
1701 818c7501 2019-07-11 stsp .It D Ta file was deleted
1702 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
1703 818c7501 2019-07-11 stsp .It A Ta new file was added
1704 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1705 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1708 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
1709 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
1710 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
1711 818c7501 2019-07-11 stsp .Ar branch
1712 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
1714 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
1715 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
1716 f09e2405 2019-07-11 stsp when the rebase operation continues.
1718 818c7501 2019-07-11 stsp .Cm got rebase
1719 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
1720 a85446b2 2020-01-04 stsp If the work tree is not yet fully updated to the tip commit of its
1721 a85446b2 2020-01-04 stsp branch then the work tree must first be updated with
1722 818c7501 2019-07-11 stsp .Cm got update .
1723 4ed9f614 2019-08-04 stsp If changes have been staged with
1724 4ed9f614 2019-08-04 stsp .Cm got stage ,
1725 bc3056e3 2019-08-18 stsp these changes must first be committed with
1726 4ed9f614 2019-08-04 stsp .Cm got commit
1727 4ed9f614 2019-08-04 stsp or unstaged with
1728 4ed9f614 2019-08-04 stsp .Cm got unstage .
1729 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
1730 f09e2405 2019-07-11 stsp committed with
1731 f09e2405 2019-07-11 stsp .Cm got commit
1732 f09e2405 2019-07-11 stsp or reverted with
1733 f09e2405 2019-07-11 stsp .Cm got revert .
1735 64c6d990 2019-07-11 stsp .Ar branch
1736 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
1737 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
1740 7d5807f4 2019-07-11 stsp .Cm got update
1742 7d5807f4 2019-07-11 stsp .Cm got commit
1743 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
1744 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
1745 7d5807f4 2019-07-11 stsp conflict resolution purposes.
1747 818c7501 2019-07-11 stsp The options for
1748 818c7501 2019-07-11 stsp .Cm got rebase
1749 818c7501 2019-07-11 stsp are as follows:
1750 818c7501 2019-07-11 stsp .Bl -tag -width Ds
1752 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
1753 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1755 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
1756 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1758 e600f124 2021-03-21 stsp Show a list of past rebase operations, represented by references in the
1759 e600f124 2021-03-21 stsp .Dq refs/got/backup/rebase
1760 e600f124 2021-03-21 stsp reference namespace.
1762 e600f124 2021-03-21 stsp Display the author, date, and log message of each backed up commit,
1763 e600f124 2021-03-21 stsp the object ID of the corresponding post-rebase commit, and
1764 e600f124 2021-03-21 stsp the object ID of their common ancestor commit.
1765 e600f124 2021-03-21 stsp Given these object IDs,
1767 e600f124 2021-03-21 stsp .Cm got log
1768 e600f124 2021-03-21 stsp command with the
1772 e600f124 2021-03-21 stsp options can be used to examine the history of either version of the branch,
1774 e600f124 2021-03-21 stsp .Cm got branch
1775 e600f124 2021-03-21 stsp command with the
1777 e600f124 2021-03-21 stsp option can be used to create a new branch from a pre-rebase state if desired.
1780 e600f124 2021-03-21 stsp .Ar branch
1781 e600f124 2021-03-21 stsp is specified, only show commits which at some point in time represented this
1783 e600f124 2021-03-21 stsp Otherwise, list all backed up commits for any branches.
1785 e600f124 2021-03-21 stsp If this option is used,
1786 e600f124 2021-03-21 stsp .Cm got rebase
1787 e600f124 2021-03-21 stsp does not require a work tree.
1788 e600f124 2021-03-21 stsp None of the other options can be used together with
1791 643b85bc 2021-07-16 stsp Delete backups created by past rebase operations, represented by references
1793 643b85bc 2021-07-16 stsp .Dq refs/got/backup/rebase
1794 643b85bc 2021-07-16 stsp reference namespace.
1797 643b85bc 2021-07-16 stsp .Ar branch
1798 643b85bc 2021-07-16 stsp is specified, only delete backups which at some point in time represented
1799 643b85bc 2021-07-16 stsp this branch.
1800 643b85bc 2021-07-16 stsp Otherwise, delete all references found within
1801 643b85bc 2021-07-16 stsp .Dq refs/got/backup/rebase .
1803 643b85bc 2021-07-16 stsp Any commit, tree, tag, and blob objects belonging to deleted backups
1804 643b85bc 2021-07-16 stsp remain in the repository and may be removed separately with
1805 643b85bc 2021-07-16 stsp Git's garbage collector or
1806 643b85bc 2021-07-16 stsp .Cm gotadmin cleanup .
1808 643b85bc 2021-07-16 stsp If this option is used,
1809 643b85bc 2021-07-16 stsp .Cm got rebase
1810 643b85bc 2021-07-16 stsp does not require a work tree.
1811 643b85bc 2021-07-16 stsp None of the other options can be used together with
1815 818c7501 2019-07-11 stsp Short alias for
1816 818c7501 2019-07-11 stsp .Cm rebase .
1817 643b85bc 2021-07-16 stsp .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 Oo Fl l Oc Oo Fl X Oc Op Ar branch
1818 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
1819 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
1821 6e54d307 2020-02-24 stsp Before starting a
1822 6e54d307 2020-02-24 stsp .Cm histedit
1823 6e54d307 2020-02-24 stsp operation the work tree's current branch must be set with
1824 6e54d307 2020-02-24 stsp .Cm got update -b
1825 6e54d307 2020-02-24 stsp to the branch which should be edited, unless this branch is already the
1826 6e54d307 2020-02-24 stsp current branch of the work tree.
1827 6e54d307 2020-02-24 stsp The tip of this branch represents the upper bound (inclusive) of commits
1828 6e54d307 2020-02-24 stsp touched by the
1829 6e54d307 2020-02-24 stsp .Cm histedit
1830 6e54d307 2020-02-24 stsp operation.
1832 6e54d307 2020-02-24 stsp Furthermore, the work tree's base commit
1833 6e54d307 2020-02-24 stsp must be set with
1834 6e54d307 2020-02-24 stsp .Cm got update -c
1835 6e54d307 2020-02-24 stsp to a point in this branch's commit history where editing should begin.
1836 6e54d307 2020-02-24 stsp This commit represents the lower bound (non-inclusive) of commits touched
1838 6e54d307 2020-02-24 stsp .Cm histedit
1839 6e54d307 2020-02-24 stsp operation.
1841 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
1842 0ebf8283 2019-07-24 stsp .Ar histedit script
1843 46fa4c83 2020-02-24 stsp which can be written in an editor based on a template, passed on the
1844 46fa4c83 2020-02-24 stsp command line, or generated with the
1850 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
1851 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
1852 0ebf8283 2019-07-24 stsp whitespace and an argument.
1853 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
1854 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
1855 0ebf8283 2019-07-24 stsp Lines which begin with the
1857 0ebf8283 2019-07-24 stsp character are ignored entirely.
1859 0ebf8283 2019-07-24 stsp The available commands are as follows:
1860 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
1861 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
1862 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
1863 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
1864 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
1865 0ebf8283 2019-07-24 stsp listed further below that will be used.
1866 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
1867 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
1868 0ebf8283 2019-07-24 stsp the commit on the previous line.
1869 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
1870 0ebf8283 2019-07-24 stsp log message can be written.
1873 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
1874 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
1875 5b87815e 2020-03-05 stsp No commit may be listed more than once.
1877 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
1878 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
1879 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
1880 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
1881 498a90b7 2019-07-25 stsp switched to it.
1883 1795b260 2021-04-02 kn Old commits in their pre-histedit state are automatically backed up in the
1884 e600f124 2021-03-21 stsp .Dq refs/got/backup/histedit
1885 e600f124 2021-03-21 stsp reference namespace.
1886 e600f124 2021-03-21 stsp As long as these references are not removed older versions of edited
1887 e600f124 2021-03-21 stsp commits will remain in the repository and can be viewed with the
1888 e600f124 2021-03-21 stsp .Cm got histedit -l
1890 e600f124 2021-03-21 stsp Removal of these references makes objects which become unreachable via
1891 e6786710 2021-07-03 stsp any reference subject to removal by Git's garbage collector or
1892 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
1894 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
1895 0ebf8283 2019-07-24 stsp using the following status codes:
1896 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
1897 0ebf8283 2019-07-24 stsp .It G Ta file was merged
1898 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
1899 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
1900 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
1901 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
1902 0ebf8283 2019-07-24 stsp .It A Ta new file was added
1903 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1904 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1907 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
1908 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
1909 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
1910 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
1912 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
1913 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
1914 0ebf8283 2019-07-24 stsp when the histedit operation continues.
1916 0ebf8283 2019-07-24 stsp .Cm got histedit
1917 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
1918 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
1919 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
1920 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
1921 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
1922 0ebf8283 2019-07-24 stsp to a single base commit with
1923 0ebf8283 2019-07-24 stsp .Cm got update .
1924 4ed9f614 2019-08-04 stsp If changes have been staged with
1925 4ed9f614 2019-08-04 stsp .Cm got stage ,
1926 bc3056e3 2019-08-18 stsp these changes must first be committed with
1927 4ed9f614 2019-08-04 stsp .Cm got commit
1928 4ed9f614 2019-08-04 stsp or unstaged with
1929 4ed9f614 2019-08-04 stsp .Cm got unstage .
1930 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
1931 0ebf8283 2019-07-24 stsp committed with
1932 0ebf8283 2019-07-24 stsp .Cm got commit
1933 0ebf8283 2019-07-24 stsp or reverted with
1934 0ebf8283 2019-07-24 stsp .Cm got revert .
1935 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
1936 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
1939 7ef62c4e 2020-02-24 stsp .Cm got update ,
1940 7ef62c4e 2020-02-24 stsp .Cm got rebase ,
1942 65db4ffb 2020-02-24 stsp .Cm got integrate
1943 65db4ffb 2020-02-24 stsp commands will refuse to run while a histedit operation is in progress.
1944 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
1945 0ebf8283 2019-07-24 stsp .Cm got commit
1946 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
1947 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
1949 0ebf8283 2019-07-24 stsp The options for
1950 0ebf8283 2019-07-24 stsp .Cm got histedit
1951 0ebf8283 2019-07-24 stsp are as follows:
1952 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
1954 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
1955 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1957 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
1958 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1960 466785b9 2020-12-10 jrick Fold all commits into a single commit.
1961 466785b9 2020-12-10 jrick This option is a quick equivalent to a histedit script which folds all
1962 466785b9 2020-12-10 jrick commits, combining them all into one commit.
1965 2a78779e 2020-12-11 stsp option can only be used when starting a new histedit operation.
1966 466785b9 2020-12-10 jrick If this option is used, no other command-line arguments are allowed.
1967 ddbfac99 2020-02-24 stsp .It Fl F Ar histedit-script
1968 ddbfac99 2020-02-24 stsp Use the specified
1969 ddbfac99 2020-02-24 stsp .Ar histedit-script
1970 ddbfac99 2020-02-24 stsp instead of opening a temporary file in an editor where a histedit script
1971 ddbfac99 2020-02-24 stsp can be written.
1973 083957f4 2020-02-24 stsp Edit log messages only.
1974 083957f4 2020-02-24 stsp This option is a quick equivalent to a histedit script which edits
1975 2bdefe56 2020-02-24 tracey only log messages but otherwise leaves every picked commit as-is.
1978 083957f4 2020-02-24 stsp option can only be used when starting a new histedit operation.
1979 083957f4 2020-02-24 stsp If this option is used, no other command-line arguments are allowed.
1981 e600f124 2021-03-21 stsp Show a list of past histedit operations, represented by references in the
1982 e600f124 2021-03-21 stsp .Dq refs/got/backup/histedit
1983 e600f124 2021-03-21 stsp reference namespace.
1985 e600f124 2021-03-21 stsp Display the author, date, and log message of each backed up commit,
1986 e600f124 2021-03-21 stsp the object ID of the corresponding post-histedit commit, and
1987 e600f124 2021-03-21 stsp the object ID of their common ancestor commit.
1988 e600f124 2021-03-21 stsp Given these object IDs,
1990 e600f124 2021-03-21 stsp .Cm got log
1991 e600f124 2021-03-21 stsp command with the
1995 e600f124 2021-03-21 stsp options can be used to examine the history of either version of the branch,
1997 e600f124 2021-03-21 stsp .Cm got branch
1998 e600f124 2021-03-21 stsp command with the
2000 e600f124 2021-03-21 stsp option can be used to create a new branch from a pre-histedit state if desired.
2003 e600f124 2021-03-21 stsp .Ar branch
2004 e600f124 2021-03-21 stsp is specified, only show commits which at some point in time represented this
2006 e600f124 2021-03-21 stsp Otherwise, list all backed up commits for any branches.
2008 e600f124 2021-03-21 stsp If this option is used,
2009 e600f124 2021-03-21 stsp .Cm got histedit
2010 e600f124 2021-03-21 stsp does not require a work tree.
2011 e600f124 2021-03-21 stsp None of the other options can be used together with
2014 643b85bc 2021-07-16 stsp Delete backups created by past histedit operations, represented by references
2016 643b85bc 2021-07-16 stsp .Dq refs/got/backup/histedit
2017 643b85bc 2021-07-16 stsp reference namespace.
2020 643b85bc 2021-07-16 stsp .Ar branch
2021 643b85bc 2021-07-16 stsp is specified, only delete backups which at some point in time represented
2022 643b85bc 2021-07-16 stsp this branch.
2023 643b85bc 2021-07-16 stsp Otherwise, delete all references found within
2024 643b85bc 2021-07-16 stsp .Dq refs/got/backup/histedit .
2026 643b85bc 2021-07-16 stsp Any commit, tree, tag, and blob objects belonging to deleted backups
2027 643b85bc 2021-07-16 stsp remain in the repository and may be removed separately with
2028 643b85bc 2021-07-16 stsp Git's garbage collector or
2029 643b85bc 2021-07-16 stsp .Cm gotadmin cleanup .
2031 643b85bc 2021-07-16 stsp If this option is used,
2032 643b85bc 2021-07-16 stsp .Cm got histedit
2033 643b85bc 2021-07-16 stsp does not require a work tree.
2034 643b85bc 2021-07-16 stsp None of the other options can be used together with
2038 0ebf8283 2019-07-24 stsp Short alias for
2039 0ebf8283 2019-07-24 stsp .Cm histedit .
2040 2822a352 2019-10-15 stsp .It Cm integrate Ar branch
2041 2822a352 2019-10-15 stsp Integrate the specified
2042 2822a352 2019-10-15 stsp .Ar branch
2043 2822a352 2019-10-15 stsp into the work tree's current branch.
2044 2822a352 2019-10-15 stsp Files in the work tree are updated to match the contents on the integrated
2045 2822a352 2019-10-15 stsp .Ar branch ,
2046 2822a352 2019-10-15 stsp and the reference of the work tree's branch is changed to point at the
2047 2822a352 2019-10-15 stsp head commit of the integrated
2048 2822a352 2019-10-15 stsp .Ar branch .
2050 2822a352 2019-10-15 stsp Both branches can be considered equivalent after integration since they
2051 2822a352 2019-10-15 stsp will be pointing at the same commit.
2052 2822a352 2019-10-15 stsp Both branches remain available for future work, if desired.
2053 2822a352 2019-10-15 stsp In case the integrated
2054 2822a352 2019-10-15 stsp .Ar branch
2055 2822a352 2019-10-15 stsp is no longer needed it may be deleted with
2056 2822a352 2019-10-15 stsp .Cm got branch -d .
2058 2822a352 2019-10-15 stsp Show the status of each affected file, using the following status codes:
2059 2822a352 2019-10-15 stsp .Bl -column YXZ description
2060 2822a352 2019-10-15 stsp .It U Ta file was updated
2061 2822a352 2019-10-15 stsp .It D Ta file was deleted
2062 2822a352 2019-10-15 stsp .It A Ta new file was added
2063 2822a352 2019-10-15 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
2064 2822a352 2019-10-15 stsp .It ! Ta a missing versioned file was restored
2067 2822a352 2019-10-15 stsp .Cm got integrate
2068 2822a352 2019-10-15 stsp will refuse to run if certain preconditions are not met.
2069 2822a352 2019-10-15 stsp Most importantly, the
2070 2822a352 2019-10-15 stsp .Ar branch
2071 2822a352 2019-10-15 stsp must have been rebased onto the work tree's current branch with
2072 2822a352 2019-10-15 stsp .Cm got rebase
2073 2822a352 2019-10-15 stsp before it can be integrated, in order to linearize commit history and
2074 2822a352 2019-10-15 stsp resolve merge conflicts.
2075 2822a352 2019-10-15 stsp If the work tree contains multiple base commits it must first be updated
2076 2822a352 2019-10-15 stsp to a single base commit with
2077 2822a352 2019-10-15 stsp .Cm got update .
2078 2822a352 2019-10-15 stsp If changes have been staged with
2079 2822a352 2019-10-15 stsp .Cm got stage ,
2080 2822a352 2019-10-15 stsp these changes must first be committed with
2081 2822a352 2019-10-15 stsp .Cm got commit
2082 2822a352 2019-10-15 stsp or unstaged with
2083 2822a352 2019-10-15 stsp .Cm got unstage .
2084 2822a352 2019-10-15 stsp If the work tree contains local changes, these changes must first be
2085 2822a352 2019-10-15 stsp committed with
2086 2822a352 2019-10-15 stsp .Cm got commit
2087 2822a352 2019-10-15 stsp or reverted with
2088 2822a352 2019-10-15 stsp .Cm got revert .
2090 2822a352 2019-10-15 stsp Short alias for
2091 2822a352 2019-10-15 stsp .Cm integrate .
2092 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 ...
2093 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
2096 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
2097 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
2098 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
2099 4ed9f614 2019-08-04 stsp .Cm got status .
2101 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
2102 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
2103 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
2104 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
2105 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
2108 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
2109 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
2110 9d8b19a4 2019-08-04 stsp committed.
2112 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
2113 4ed9f614 2019-08-04 stsp .Cm got commit ,
2114 4ed9f614 2019-08-04 stsp .Cm got status ,
2116 4ed9f614 2019-08-04 stsp .Cm got diff .
2117 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
2118 4ed9f614 2019-08-04 stsp .Cm got commit
2119 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
2120 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
2121 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
2123 4ed9f614 2019-08-04 stsp .Cm got status
2124 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
2126 4ed9f614 2019-08-04 stsp .Cm got diff
2127 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
2128 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
2130 4ed9f614 2019-08-04 stsp .Cm got revert
2131 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
2132 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
2134 4ed9f614 2019-08-04 stsp The options for
2135 4ed9f614 2019-08-04 stsp .Cm got stage
2136 4ed9f614 2019-08-04 stsp are as follows:
2137 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
2139 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
2140 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
2141 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
2142 1dd86744 2019-08-12 anthony among the specified paths.
2143 1dd86744 2019-08-12 anthony Otherwise, show all staged paths.
2145 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
2146 dc424a06 2019-08-07 stsp select or reject changes for staging based on
2148 6d23ec10 2019-08-08 stsp (stage change),
2150 6d23ec10 2019-08-08 stsp (reject change), and
2152 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
2153 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
2154 dc424a06 2019-08-07 stsp modified file content can be staged.
2155 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
2156 6d23ec10 2019-08-08 stsp their entirety.
2157 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
2160 3a070a2b 2019-08-07 stsp option, read
2165 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
2166 0e2f5884 2019-08-07 stsp .Ar response-script
2167 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
2169 af358f55 2020-07-23 stsp Allow staging of symbolic links which point outside of the path space
2170 af358f55 2020-07-23 stsp that is under version control.
2171 af358f55 2020-07-23 stsp By default,
2172 af358f55 2020-07-23 stsp .Cm got stage
2173 af358f55 2020-07-23 stsp will reject such symbolic links due to safety concerns.
2174 35213c7c 2020-07-23 stsp As a precaution,
2176 af358f55 2020-07-23 stsp may decide to represent such a symbolic link as a regular file which contains
2177 af358f55 2020-07-23 stsp the link's target path, rather than creating an actual symbolic link which
2178 af358f55 2020-07-23 stsp points outside of the work tree.
2179 af358f55 2020-07-23 stsp Use of this option is discouraged because external mechanisms such as
2180 af358f55 2020-07-23 stsp .Dq make obj
2181 af358f55 2020-07-23 stsp are better suited for managing symbolic links to paths not under
2182 af358f55 2020-07-23 stsp version control.
2185 4ed9f614 2019-08-04 stsp .Cm got stage
2186 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
2187 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
2188 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
2189 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
2190 4ed9f614 2019-08-04 stsp .Cm got update
2191 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
2192 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
2195 4ed9f614 2019-08-04 stsp .Cm got update ,
2196 4ed9f614 2019-08-04 stsp .Cm got rebase ,
2198 4ed9f614 2019-08-04 stsp .Cm got histedit
2199 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
2200 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
2201 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
2202 4ed9f614 2019-08-04 stsp .Cm got unstage
2203 4ed9f614 2019-08-04 stsp before it can be updated with
2204 4ed9f614 2019-08-04 stsp .Cm got update ,
2205 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
2207 4ed9f614 2019-08-04 stsp Short alias for
2208 4ed9f614 2019-08-04 stsp .Cm stage .
2209 dfc23429 2019-08-11 stsp .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
2210 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
2211 4ed9f614 2019-08-04 stsp back into non-staged status.
2214 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
2215 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
2217 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
2218 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
2219 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
2220 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
2221 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
2222 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
2223 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
2224 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
2227 2e1f37b0 2019-08-08 stsp The options for
2228 2e1f37b0 2019-08-08 stsp .Cm got unstage
2229 2e1f37b0 2019-08-08 stsp are as follows:
2230 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
2232 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
2233 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
2235 2e1f37b0 2019-08-08 stsp (unstage change),
2237 2e1f37b0 2019-08-08 stsp (keep change staged), and
2239 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
2240 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
2241 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
2242 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
2243 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
2246 2e1f37b0 2019-08-08 stsp option, read
2251 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
2252 2e1f37b0 2019-08-08 stsp .Ar response-script
2253 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
2256 4ed9f614 2019-08-04 stsp Short alias for
2257 4ed9f614 2019-08-04 stsp .Cm unstage .
2258 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 ...
2259 896e9b6f 2019-08-26 stsp Parse and print contents of objects to standard output in a line-based
2260 896e9b6f 2019-08-26 stsp text format.
2261 896e9b6f 2019-08-26 stsp Content of commit, tree, and tag objects is printed in a way similar
2262 896e9b6f 2019-08-26 stsp to the actual content stored in such objects.
2263 896e9b6f 2019-08-26 stsp Blob object contents are printed as they would appear in files on disk.
2265 896e9b6f 2019-08-26 stsp Attempt to interpret each argument as a reference, a tag name, or
2266 896e9b6f 2019-08-26 stsp an object ID SHA1 hash.
2267 01073a5d 2019-08-22 stsp References will be resolved to an object ID.
2268 01073a5d 2019-08-22 stsp Tag names will resolved to a tag object.
2269 01073a5d 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
2270 01073a5d 2019-08-22 stsp automatically, provided the abbreviation is unique.
2272 896e9b6f 2019-08-26 stsp If none of the above interpretations produce a valid result, or if the
2274 896e9b6f 2019-08-26 stsp option is used, attempt to interpret the argument as a path which will
2275 896e9b6f 2019-08-26 stsp be resolved to the ID of an object found at this path in the repository.
2277 01073a5d 2019-08-22 stsp The options for
2278 01073a5d 2019-08-22 stsp .Cm got cat
2279 01073a5d 2019-08-22 stsp are as follows:
2280 01073a5d 2019-08-22 stsp .Bl -tag -width Ds
2281 896e9b6f 2019-08-26 stsp .It Fl c Ar commit
2282 896e9b6f 2019-08-26 stsp Look up paths in the specified
2283 896e9b6f 2019-08-26 stsp .Ar commit .
2284 896e9b6f 2019-08-26 stsp If this option is not used, paths are looked up in the commit resolved
2285 896e9b6f 2019-08-26 stsp via the repository's HEAD reference.
2286 896e9b6f 2019-08-26 stsp The expected argument is a commit ID SHA1 hash or an existing reference
2287 896e9b6f 2019-08-26 stsp or tag name which will be resolved to a commit ID.
2288 896e9b6f 2019-08-26 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
2289 896e9b6f 2019-08-26 stsp automatically, provided the abbreviation is unique.
2290 01073a5d 2019-08-22 stsp .It Fl r Ar repository-path
2291 01073a5d 2019-08-22 stsp Use the repository at the specified path.
2292 01073a5d 2019-08-22 stsp If not specified, assume the repository is located at or above the current
2293 01073a5d 2019-08-22 stsp working directory.
2294 01073a5d 2019-08-22 stsp If this directory is a
2296 01073a5d 2019-08-22 stsp work tree, use the repository path associated with this work tree.
2298 896e9b6f 2019-08-26 stsp Interpret all arguments as paths only.
2299 896e9b6f 2019-08-26 stsp This option can be used to resolve ambiguity in cases where paths
2300 896e9b6f 2019-08-26 stsp look like tag names, reference names, or object IDs.
2302 b2118c49 2020-07-28 stsp .It Cm info Op Ar path ...
2303 b2118c49 2020-07-28 stsp Display meta-data stored in a work tree.
2305 b2118c49 2020-07-28 stsp .Xr got-worktree 5
2306 b2118c49 2020-07-28 stsp for details.
2308 b2118c49 2020-07-28 stsp The work tree to use is resolved implicitly by walking upwards from the
2309 b2118c49 2020-07-28 stsp current working directory.
2311 b2118c49 2020-07-28 stsp If one or more
2313 b2118c49 2020-07-28 stsp arguments are specified, show additional per-file information for tracked
2314 b2118c49 2020-07-28 stsp files located at or within these paths.
2317 b2118c49 2020-07-28 stsp argument corresponds to the work tree's root directory, display information
2318 b2118c49 2020-07-28 stsp for all tracked files.
2320 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
2321 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
2322 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
2323 74416c47 2019-05-09 stsp The author's name and email address for
2324 21a44f98 2019-07-15 stsp .Cm got commit
2326 21a44f98 2019-07-15 stsp .Cm got import ,
2327 74416c47 2019-05-09 stsp for example:
2328 aba9c984 2019-09-08 stsp .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
2331 84792843 2019-08-09 stsp may fail to parse commits without an email address in author data,
2333 84792843 2019-08-09 stsp attempts to reject
2334 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
2335 84792843 2019-08-09 stsp environment variables with a missing email address.
2337 50b0790e 2020-09-11 stsp .Ev GOT_AUTHOR will be overriden by configuration settings in
2338 50b0790e 2020-09-11 stsp .Xr got.conf 5
2339 50b0790e 2020-09-11 stsp or by Git's
2340 aba9c984 2019-09-08 stsp .Dv user.name
2342 709ae9eb 2019-09-08 stsp .Dv user.email
2343 709ae9eb 2019-09-08 stsp configuration settings in the repository's
2344 aba9c984 2019-09-08 stsp .Pa .git/config
2347 c9956ddf 2019-09-08 stsp .Dv user.name
2349 c9956ddf 2019-09-08 stsp .Dv user.email
2350 c9956ddf 2019-09-08 stsp configuration settings contained in Git's global
2351 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
2352 257add31 2020-09-09 stsp configuration file will only be used if neither
2353 257add31 2020-09-09 stsp .Xr got.conf 5
2355 c9956ddf 2019-09-08 stsp .Ev GOT_AUTHOR
2356 257add31 2020-09-09 stsp environment variable provide author information.
2357 1dd86744 2019-08-12 anthony .It Ev VISUAL , EDITOR
2358 23594da9 2019-05-13 stsp The editor spawned by
2359 8e7bd50a 2019-08-22 stsp .Cm got commit ,
2360 46215d2a 2020-09-11 stsp .Cm got histedit ,
2361 8e7bd50a 2019-08-22 stsp .Cm got import ,
2363 8e7bd50a 2019-08-22 stsp .Cm got tag .
2364 5b735925 2020-09-15 stsp If not set, the
2366 5b735925 2020-09-15 stsp text editor will be spawned in order to give
2368 5b735925 2020-09-15 stsp the attention it deserves.
2369 b1ebc001 2019-08-13 stsp .It Ev GOT_LOG_DEFAULT_LIMIT
2370 b1ebc001 2019-08-13 stsp The default limit on the number of commits traversed by
2371 b1ebc001 2019-08-13 stsp .Cm got log .
2372 b1ebc001 2019-08-13 stsp If set to zero, the limit is unbounded.
2373 b1ebc001 2019-08-13 stsp This variable will be silently ignored if it is set to a non-numeric value.
2376 257add31 2020-09-09 stsp .Bl -tag -width packed-refs -compact
2377 257add31 2020-09-09 stsp .It Pa got.conf
2378 257add31 2020-09-09 stsp Repository-wide configuration settings for
2380 50b0790e 2020-09-11 stsp If present, a
2381 50b0790e 2020-09-11 stsp .Xr got.conf 5
2382 50b0790e 2020-09-11 stsp configuration file located in the root directory of a Git repository
2383 50b0790e 2020-09-11 stsp supersedes any relevant settings in Git's
2384 257add31 2020-09-09 stsp .Pa config
2387 50b0790e 2020-09-11 stsp .It Pa .got/got.conf
2388 50b0790e 2020-09-11 stsp Worktree-specific configuration settings for
2390 50b0790e 2020-09-11 stsp If present, a
2391 1795b260 2021-04-02 kn .Xr got.conf 5
2392 50b0790e 2020-09-11 stsp configuration file in the
2394 50b0790e 2020-09-11 stsp meta-data directory of a work tree supersedes any relevant settings in
2395 50b0790e 2020-09-11 stsp the repository's
2396 50b0790e 2020-09-11 stsp .Xr got.conf 5
2397 50b0790e 2020-09-11 stsp configuration file and Git's
2398 50b0790e 2020-09-11 stsp .Pa config
2401 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
2402 5c860e29 2018-03-12 stsp .Ex -std got
2403 97925469 2018-03-17 stsp .Sh EXAMPLES
2404 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
2407 fd039d72 2020-03-18 stsp .Dl $ cd /var/git/
2408 fd039d72 2020-03-18 stsp .Dl $ got clone ssh://git@github.com/openbsd/src.git
2410 fd039d72 2020-03-18 stsp Use of HTTP URLs currently requires
2411 fa6e0e48 2019-05-23 stsp .Xr git 1 :
2413 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
2414 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
2416 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
2418 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
2419 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
2420 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
2422 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
2423 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
2425 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
2427 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
2429 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
2431 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
2433 081470ac 2020-08-13 stsp In a work tree, display files in a potentially problematic state:
2435 081470ac 2020-08-13 stsp .Dl $ got status -s 'C!~?'
2437 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
2439 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
2441 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
2443 4e759de4 2019-06-26 stsp .Dl $ got branch -l
2445 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
2446 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
2447 d83d9d5c 2019-05-13 stsp which is forked off the
2448 d83d9d5c 2019-05-13 stsp .Dq master
2451 7b4f1fcb 2021-01-27 stsp .Dl $ got branch -c master unified-buffer-cache
2453 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
2454 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
2455 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
2457 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
2459 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
2460 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
2462 fa6e0e48 2019-05-23 stsp .Dl $ got commit
2464 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
2465 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
2466 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
2468 48c8c60d 2020-01-27 stsp .Dl $ got log -p -l 3
2470 3d0ac559 2020-04-18 stsp As above, but display changes in the order in which
2471 04e9dcf3 2020-04-18 stsp .Xr patch 1
2472 04e9dcf3 2020-04-18 stsp could apply them in sequence:
2474 04e9dcf3 2020-04-18 stsp .Dl $ got log -p -l 3 -R
2476 5b666081 2020-02-24 stsp In a work tree or a git repository directory, log the history of a subdirectory:
2478 5b666081 2020-02-24 stsp .Dl $ got log sys/uvm
2480 5b666081 2020-02-24 stsp While operating inside a work tree, paths are specified relative to the current
2481 5b666081 2020-02-24 stsp working directory, so this command will log the subdirectory
2482 5b666081 2020-02-24 stsp .Pa sys/uvm :
2484 cf07f22b 2020-07-25 stsp .Dl $ cd sys/uvm && got log\ .
2486 5b666081 2020-02-24 stsp And this command has the same effect:
2488 5b666081 2020-02-24 stsp .Dl $ cd sys/dev/usb && got log ../../uvm
2490 b2118c49 2020-07-28 stsp And this command displays work tree meta-data about all tracked files:
2492 b2118c49 2020-07-28 stsp .Dl $ cd /usr/src
2493 b2118c49 2020-07-28 stsp .Dl $ got info\ . | less
2495 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
2497 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
2498 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
2500 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
2501 e70c17ce 2019-05-22 stsp with a pre-defined log message.
2503 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
2505 bcbc2272 2020-05-20 stsp Alternatively, create a new commit from local changes in a work tree
2506 bcbc2272 2020-05-20 stsp directory with a log message that has been prepared in the file
2507 1795b260 2021-04-02 kn .Pa /tmp/msg :
2509 28cf319f 2021-01-28 stsp .Dl $ got commit -F /tmp/msg
2511 95fc3404 2019-07-15 stsp Update any work tree checked out from the
2512 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
2513 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
2515 95fc3404 2019-07-15 stsp .Dl $ got update
2517 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
2518 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
2519 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
2521 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
2522 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
2523 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
2524 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
2526 469dd726 2020-03-20 stsp Fetch new upstream commits into the local repository's
2527 469dd726 2020-03-20 stsp .Dq origin/master
2530 469dd726 2020-03-20 stsp .Dl $ cd /usr/src
2531 469dd726 2020-03-20 stsp .Dl $ got fetch
2533 469dd726 2020-03-20 stsp In a repository created with a HTTP URL and
2534 469dd726 2020-03-20 stsp .Cm git clone --bare
2536 469dd726 2020-03-20 stsp .Xr git-fetch 1
2537 469dd726 2020-03-20 stsp command must be used instead:
2539 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
2540 469dd726 2020-03-20 stsp .Dl $ git fetch origin master:refs/remotes/origin/master
2542 469dd726 2020-03-20 stsp Rebase the local
2543 469dd726 2020-03-20 stsp .Dq master
2544 469dd726 2020-03-20 stsp branch to merge the new changes that are now visible on the
2545 469dd726 2020-03-20 stsp .Dq origin/master
2548 469dd726 2020-03-20 stsp .Dl $ cd /usr/src
2549 469dd726 2020-03-20 stsp .Dl $ got update -b origin/master
2550 469dd726 2020-03-20 stsp .Dl $ got rebase master
2552 fa6e0e48 2019-05-23 stsp Rebase the
2553 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
2554 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
2555 fa6e0e48 2019-05-23 stsp .Dq master
2558 818c7501 2019-07-11 stsp .Dl $ got update -b master
2559 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
2561 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
2562 1dd86744 2019-08-12 anthony The patch can be mailed out for review and applied to
2563 1dd86744 2019-08-12 anthony .Ox Ns 's
2564 1dd86744 2019-08-12 anthony CVS tree:
2566 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
2568 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
2569 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
2572 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
2573 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
2574 0ebf8283 2019-07-24 stsp .Dl $ got histedit
2576 bf390dec 2020-03-20 stsp In order to merge changes committed to the
2577 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2578 bf390dec 2020-03-20 stsp branch back into the
2579 bf390dec 2020-03-20 stsp .Dq master
2580 bf390dec 2020-03-20 stsp branch, the
2581 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2582 bf390dec 2020-03-20 stsp branch must first be rebased onto the
2583 bf390dec 2020-03-20 stsp .Dq master
2586 bf390dec 2020-03-20 stsp .Dl $ got update -b master
2587 bf390dec 2020-03-20 stsp .Dl $ got rebase unified-buffer-cache
2589 bf390dec 2020-03-20 stsp Changes on the
2590 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2591 bf390dec 2020-03-20 stsp branch can now be made visible on the
2592 bf390dec 2020-03-20 stsp .Dq master
2593 bf390dec 2020-03-20 stsp branch with
2594 bf390dec 2020-03-20 stsp .Cm got integrate .
2595 bf390dec 2020-03-20 stsp Because the rebase operation switched the work tree to the
2596 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2597 bf390dec 2020-03-20 stsp branch, the work tree must be switched back to the
2598 bf390dec 2020-03-20 stsp .Dq master
2599 bf390dec 2020-03-20 stsp branch before the
2600 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2601 bf390dec 2020-03-20 stsp branch can be integrated into
2602 bf390dec 2020-03-20 stsp .Dq master :
2604 bf390dec 2020-03-20 stsp .Dl $ got update -b master
2605 bf390dec 2020-03-20 stsp .Dl $ got integrate unified-buffer-cache
2607 469dd726 2020-03-20 stsp Additional steps may be necessary if local changes need to be pushed back
2608 7b3fde24 2019-07-28 stsp to the remote repository, which currently requires
2609 7b3fde24 2019-07-28 stsp .Cm git push .
2610 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
2611 469dd726 2020-03-20 stsp .Cm git clone --bare
2612 7848a0e1 2020-03-19 stsp instead of
2613 7848a0e1 2020-03-19 stsp .Cm got clone ,
2615 ff2cf171 2019-07-28 stsp .Dq refspec
2616 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
2618 ff2cf171 2019-07-28 stsp .Dq refs/remotes
2619 ff2cf171 2019-07-28 stsp namespace of the local repository.
2620 1795b260 2021-04-02 kn This can be achieved by setting Git's
2621 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
2622 ff2cf171 2019-07-28 stsp configuration variable to the value
2623 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
2625 ff2cf171 2019-07-28 stsp .Cm git config
2628 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2629 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
2631 469dd726 2020-03-20 stsp Additionally, the
2632 469dd726 2020-03-20 stsp .Dq mirror
2633 469dd726 2020-03-20 stsp option must be disabled:
2635 469dd726 2020-03-20 stsp .Dl $ cd /var/git/repo
2636 469dd726 2020-03-20 stsp .Dl $ git config remote.origin.mirror false
2638 ff2cf171 2019-07-28 stsp Alternatively, the following
2639 469dd726 2020-03-20 stsp .Xr git-fetch 1
2640 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
2641 ff2cf171 2019-07-28 stsp .Pa config
2644 91c82228 2021-04-18 stsp .Dl [remote \&"origin\&"]
2645 ff2cf171 2019-07-28 stsp .Dl url = ...
2646 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
2647 469dd726 2020-03-20 stsp .Dl mirror = false
2649 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
2650 ff2cf171 2019-07-28 stsp .Dq refs/heads
2651 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
2652 ff2cf171 2019-07-28 stsp .Cm got checkout
2653 ff2cf171 2019-07-28 stsp and, if needed, created with
2654 ff2cf171 2019-07-28 stsp .Cm got branch .
2656 ff2cf171 2019-07-28 stsp Branches in the
2657 ff2cf171 2019-07-28 stsp .Dq remotes/origin
2658 469dd726 2020-03-20 stsp namespace can now be updated with incoming changes from the remote
2659 ff2cf171 2019-07-28 stsp repository with
2660 469dd726 2020-03-20 stsp .Cm got fetch
2662 469dd726 2020-03-20 stsp .Xr git-fetch 1
2663 469dd726 2020-03-20 stsp without extra command line arguments:
2665 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2666 469dd726 2020-03-20 stsp .Dl $ git fetch
2668 7b0db533 2020-02-04 stsp To make changes fetched from the remote repository appear on the
2669 ff2cf171 2019-07-28 stsp .Dq master
2670 7b0db533 2020-02-04 stsp branch, the
2671 ff2cf171 2019-07-28 stsp .Dq master
2672 ff2cf171 2019-07-28 stsp branch must be rebased onto the
2673 ff2cf171 2019-07-28 stsp .Dq origin/master
2675 7b0db533 2020-02-04 stsp This will also merge local changes, if any, with the incoming changes:
2677 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
2678 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
2681 083957f4 2020-02-24 stsp .Dq master
2682 083957f4 2020-02-24 stsp branch, log messages for local changes can now be amended with
2684 083957f4 2020-02-24 stsp by other developers and any other important new information:
2686 083957f4 2020-02-24 stsp .Dl $ got update -c origin/master
2687 083957f4 2020-02-24 stsp .Dl $ got histedit -m
2689 7b0db533 2020-02-04 stsp Local changes on the
2690 ff2cf171 2019-07-28 stsp .Dq master
2691 ff2cf171 2019-07-28 stsp branch can then be pushed to the remote
2692 ff2cf171 2019-07-28 stsp repository with
2693 ff2cf171 2019-07-28 stsp .Cm git push :
2695 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2696 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
2697 5c860e29 2018-03-12 stsp .Sh SEE ALSO
2698 0a79feb1 2021-04-10 stsp .Xr gotadmin 1 ,
2699 2312fc47 2019-07-15 stsp .Xr tog 1 ,
2700 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
2701 257add31 2020-09-09 stsp .Xr got-worktree 5 ,
2702 257add31 2020-09-09 stsp .Xr got.conf 5
2703 1a208aaf 2018-04-01 stsp .Sh AUTHORS
2704 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
2705 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
2706 bc3056e3 2019-08-18 stsp .An Joshua Stein Aq Mt jcs@openbsd.org
2707 83b416ed 2020-03-18 stsp .An Ori Bernstein Aq Mt ori@openbsd.org
2708 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
2710 cc63216e 2020-12-26 stsp is a work-in-progress and some features remain to be implemented.
2712 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
2714 cc63216e 2020-12-26 stsp to perform some tasks.
2715 cc63216e 2020-12-26 stsp In particular:
2716 cc63216e 2020-12-26 stsp .Bl -bullet
2718 cc63216e 2020-12-26 stsp Reading from remote repositories over HTTP or HTTPS protocols requires
2719 cc63216e 2020-12-26 stsp .Xr git-clone 1
2721 cc63216e 2020-12-26 stsp .Xr git-fetch 1 .
2723 cc63216e 2020-12-26 stsp Writing to remote repositories, over any protocol, requires
2724 cc63216e 2020-12-26 stsp .Xr git-push 1 .
2726 cc63216e 2020-12-26 stsp The creation of merge commits, i.e. commits with two or more parent commits,
2728 cc63216e 2020-12-26 stsp .Xr git-merge 1 .
2730 cc63216e 2020-12-26 stsp In situations where files or directories were moved around
2732 cc63216e 2020-12-26 stsp will not automatically merge changes to new locations and
2734 cc63216e 2020-12-26 stsp will usually produce better results.
