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 4ad4a1ec 2021-09-13 tracey .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 Oo Fl q 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.
557 4ad4a1ec 2021-09-13 tracey Silence progress output.
560 97b3a7be 2019-07-09 stsp Short alias for
561 97b3a7be 2019-07-09 stsp .Cm checkout .
562 4ad4a1ec 2021-09-13 tracey .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Oo Fl q Oc Op Ar path ...
563 4f331d3a 2020-04-01 stsp Update an existing work tree to a different
564 4f331d3a 2020-04-01 stsp .Ar commit .
565 4f331d3a 2020-04-01 stsp Change existing files in the work tree as necessary to match file contents
566 4f331d3a 2020-04-01 stsp of this commit.
567 4f331d3a 2020-04-01 stsp Preserve any local changes in the work tree and merge them with the
568 4f331d3a 2020-04-01 stsp incoming changes.
570 5036ab18 2020-04-18 stsp Files which already contain merge conflicts will not be updated to avoid
571 5036ab18 2020-04-18 stsp further complications.
572 5036ab18 2020-04-18 stsp Such files will be updated when
573 5036ab18 2020-04-18 stsp .Cm got update
574 5036ab18 2020-04-18 stsp is run again after merge conflicts have been resolved.
575 5036ab18 2020-04-18 stsp If the conflicting changes are no longer needed affected files can be
576 5036ab18 2020-04-18 stsp reverted with
577 5036ab18 2020-04-18 stsp .Cm got revert
578 5036ab18 2020-04-18 stsp before running
579 5036ab18 2020-04-18 stsp .Cm got update
582 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
583 7f838b36 2019-02-08 stsp .Bl -column YXZ description
584 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
585 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
586 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
587 7f838b36 2019-02-08 stsp .It D Ta file was deleted
588 7f838b36 2019-02-08 stsp .It A Ta new file was added
589 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
590 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
591 5036ab18 2020-04-18 stsp .It # Ta file was not updated because it contains merge conflicts
592 3b9f0f87 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
597 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
598 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
599 f2ea84fa 2019-07-27 stsp specified paths.
600 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
601 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
602 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
605 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
606 c4cdcb68 2019-04-03 stsp multiple base commits.
607 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
608 47ec7be7 2019-05-12 stsp .Cm got update
609 47ec7be7 2019-05-12 stsp across the entire work tree.
610 024e9686 2019-05-14 stsp Specifying a
612 024e9686 2019-05-14 stsp is incompatible with the
616 4ed9f614 2019-08-04 stsp .Cm got update
617 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
618 4ed9f614 2019-08-04 stsp If changes have been staged with
619 4ed9f614 2019-08-04 stsp .Cm got stage ,
620 bc3056e3 2019-08-18 stsp these changes must first be committed with
621 4ed9f614 2019-08-04 stsp .Cm got commit
622 4ed9f614 2019-08-04 stsp or unstaged with
623 4ed9f614 2019-08-04 stsp .Cm got unstage .
625 507dc3bb 2018-12-29 stsp The options for
626 507dc3bb 2018-12-29 stsp .Cm got update
627 507dc3bb 2018-12-29 stsp are as follows:
628 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
629 024e9686 2019-05-14 stsp .It Fl b Ar branch
630 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
632 024e9686 2019-05-14 stsp before updating the work tree.
633 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
635 4f331d3a 2020-04-01 stsp As usual, any local changes in the work tree will be preserved.
636 4f331d3a 2020-04-01 stsp This can be useful when switching to a newly created branch in order
637 4f331d3a 2020-04-01 stsp to commit existing local changes to this branch.
639 4f331d3a 2020-04-01 stsp Any local changes must be dealt with separately in order to obtain a
640 4f331d3a 2020-04-01 stsp work tree with pristine file contents corresponding exactly to the specified
641 4f331d3a 2020-04-01 stsp .Ar branch .
642 4f331d3a 2020-04-01 stsp Such changes could first be committed to a different branch with
643 4f331d3a 2020-04-01 stsp .Cm got commit ,
644 4f331d3a 2020-04-01 stsp or could be discarded with
645 4f331d3a 2020-04-01 stsp .Cm got revert .
646 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
647 507dc3bb 2018-12-29 stsp Update the work tree to the specified
648 507dc3bb 2018-12-29 stsp .Ar commit .
649 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
650 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
651 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
652 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
653 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
654 024e9686 2019-05-14 stsp branch will be used.
656 4ad4a1ec 2021-09-13 tracey Silence progress output.
659 97b3a7be 2019-07-09 stsp Short alias for
660 97b3a7be 2019-07-09 stsp .Cm update .
661 3217be6d 2021-06-22 stsp .It Cm status Oo Fl I Oc Oo Fl s Ar status-codes Oc Op Ar path ...
662 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
663 6bad629b 2019-02-04 stsp using the following status codes:
664 6bad629b 2019-02-04 stsp .Bl -column YXZ description
665 6bad629b 2019-02-04 stsp .It M Ta modified file
666 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
667 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
668 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
669 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
670 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
671 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
673 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
674 2a06fe5f 2019-08-24 stsp .It N Ta non-existent
676 2a06fe5f 2019-08-24 stsp specified on the command line
681 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
682 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
684 4ed9f614 2019-08-04 stsp If changes have been staged with
685 4ed9f614 2019-08-04 stsp .Cm got stage ,
686 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
687 4ed9f614 2019-08-04 stsp status codes:
688 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
689 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
690 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
691 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
694 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
695 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
696 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
697 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
700 081470ac 2020-08-13 stsp The options for
701 081470ac 2020-08-13 stsp .Cm got status
702 081470ac 2020-08-13 stsp are as follows:
703 081470ac 2020-08-13 stsp .Bl -tag -width Ds
705 f6343036 2021-06-22 stsp Show unversioned files even if they match an ignore pattern.
706 081470ac 2020-08-13 stsp .It Fl s Ar status-codes
707 081470ac 2020-08-13 stsp Only show files with a modification status matching any of the
708 081470ac 2020-08-13 stsp single-character status codes contained in the
709 081470ac 2020-08-13 stsp .Ar status-codes
711 081470ac 2020-08-13 stsp Any combination of codes from the above list of possible status codes
712 081470ac 2020-08-13 stsp may be specified.
713 081470ac 2020-08-13 stsp For staged files, status codes displayed in either column will be matched.
716 6841da00 2019-08-08 stsp For compatibility with
719 bd8de430 2019-10-04 stsp .Xr git 1 ,
720 6841da00 2019-08-08 stsp .Cm got status
723 bd8de430 2019-10-04 stsp patterns from
724 6841da00 2019-08-08 stsp .Pa .cvsignore
726 bd8de430 2019-10-04 stsp .Pa .gitignore
727 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
728 bd8de430 2019-10-04 stsp which match these patterns.
729 bd8de430 2019-10-04 stsp As an extension to
731 bd8de430 2019-10-04 stsp matching rules,
732 bd8de430 2019-10-04 stsp .Cm got status
733 bd8de430 2019-10-04 stsp supports consecutive asterisks,
735 bd8de430 2019-10-04 stsp which will match an arbitrary amount of directories.
737 6841da00 2019-08-08 stsp .Xr cvs 1 ,
738 6841da00 2019-08-08 stsp .Cm got status
739 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
741 bd8de430 2019-10-04 stsp .Xr git 1 ,
742 bd8de430 2019-10-04 stsp .Cm got status
743 bd8de430 2019-10-04 stsp does not support negated ignore patterns prefixed with
745 bd8de430 2019-10-04 stsp and gives no special significance to the location of path component separators,
747 bd8de430 2019-10-04 stsp in a pattern.
749 97b3a7be 2019-07-09 stsp Short alias for
750 97b3a7be 2019-07-09 stsp .Cm status .
751 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
752 38e11793 2018-06-13 stsp Display history of a repository.
755 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
756 dc990cbf 2020-02-22 stsp If invoked in a work tree, the
758 dc990cbf 2020-02-22 stsp is interpreted relative to the current working directory,
759 dc990cbf 2020-02-22 stsp and the work tree's path prefix is implicitly prepended.
760 dc990cbf 2020-02-22 stsp Otherwise, the path is interpreted relative to the repository root.
762 38e11793 2018-06-13 stsp The options for
763 38e11793 2018-06-13 stsp .Cm got log
764 38e11793 2018-06-13 stsp are as follows:
765 38e11793 2018-06-13 stsp .Bl -tag -width Ds
767 1137e0ae 2020-01-27 stsp Display individual commits which were merged into the current branch
768 1137e0ae 2020-01-27 stsp from other branches.
769 48c8c60d 2020-01-27 stsp By default,
770 48c8c60d 2020-01-27 stsp .Cm got log
771 48c8c60d 2020-01-27 stsp shows the linear history of the current branch only.
772 38e11793 2018-06-13 stsp .It Fl c Ar commit
773 38e11793 2018-06-13 stsp Start traversing history at the specified
774 38e11793 2018-06-13 stsp .Ar commit .
775 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
776 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
777 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
778 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
779 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
780 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
781 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
782 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
784 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
785 6238ee32 2018-06-13 stsp .It Fl l Ar N
786 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
787 b1ebc001 2019-08-13 stsp If this option is not specified, a default limit value of zero is used,
788 b1ebc001 2019-08-13 stsp which is treated as an unbounded limit.
790 b1ebc001 2019-08-13 stsp .Ev GOT_LOG_DEFAULT_LIMIT
791 b1ebc001 2019-08-13 stsp environment variable may be set to change this default value.
793 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
796 44392932 2019-08-25 stsp is specified, only show the patch of modifications at or within this path.
798 0208f208 2020-05-05 stsp Display the list of file paths changed in each commit, using the following
799 0208f208 2020-05-05 stsp status codes:
800 0208f208 2020-05-05 stsp .Bl -column YXZ description
801 0208f208 2020-05-05 stsp .It M Ta modified file
802 0208f208 2020-05-05 stsp .It D Ta file was deleted
803 0208f208 2020-05-05 stsp .It A Ta new file was added
804 0208f208 2020-05-05 stsp .It m Ta modified file modes (executable bit only)
806 c6390436 2019-11-29 kn .It Fl s Ar search-pattern
807 c6390436 2019-11-29 kn If specified, show only commits with a log message matched by the extended
808 6841bf13 2019-11-29 kn regular expression
809 6841bf13 2019-11-29 kn .Ar search-pattern .
810 0208f208 2020-05-05 stsp When used together with
812 0208f208 2020-05-05 stsp then the file paths changed by a commit can be matched as well.
813 6841bf13 2019-11-29 kn Regular expression syntax is documented in
814 6841bf13 2019-11-29 kn .Xr re_format 7 .
815 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
816 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
817 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
818 04ca23f4 2018-07-16 stsp working directory.
819 e9cf2e30 2019-02-05 stsp If this directory is a
821 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
823 dbec59df 2020-04-18 stsp Determine a set of commits to display as usual, but display these commits
824 dbec59df 2020-04-18 stsp in reverse order.
825 d1fe46f9 2020-04-18 stsp .It Fl x Ar commit
826 4e20a648 2021-03-21 jrick Stop traversing commit history immediately after the specified
828 52ab7958 2020-04-18 stsp has been traversed.
829 d1fe46f9 2020-04-18 stsp This option has no effect if the specified
831 d1fe46f9 2020-04-18 stsp is never traversed.
833 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
834 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
835 bd81cfb7 2020-04-19 stsp local changes in the work tree.
838 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
840 d24820bf 2019-08-11 stsp If two arguments are provided, treat each argument as a reference, a tag
841 d24820bf 2019-08-11 stsp name, or an object ID SHA1 hash, and display differences between the
842 d24820bf 2019-08-11 stsp corresponding objects.
843 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
844 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
845 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
847 c0cc5c62 2018-10-18 stsp The options for
848 c0cc5c62 2018-10-18 stsp .Cm got diff
849 c0cc5c62 2018-10-18 stsp are as follows:
850 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
852 64453f7e 2020-11-21 stsp Treat file contents as ASCII text even if binary data is detected.
853 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
854 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
855 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
856 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
857 b72f483a 2019-02-05 stsp Use the repository at the specified path.
858 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
859 b72f483a 2019-02-05 stsp working directory.
860 b72f483a 2019-02-05 stsp If this directory is a
862 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
864 4ed9f614 2019-08-04 stsp Show changes staged with
865 4ed9f614 2019-08-04 stsp .Cm got stage
866 bd81cfb7 2020-04-19 stsp instead of showing local changes in the work tree.
867 4ed9f614 2019-08-04 stsp This option is only valid when
868 4ed9f614 2019-08-04 stsp .Cm got diff
869 4ed9f614 2019-08-04 stsp is invoked in a work tree.
871 63035f9f 2019-10-06 stsp Ignore whitespace-only changes.
874 bc26cce8 2019-08-04 stsp Short alias for
876 dfc23429 2019-08-11 stsp .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
877 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
879 1ff8e573 2018-08-02 stsp The options for
880 1ff8e573 2018-08-02 stsp .Cm got blame
881 1ff8e573 2018-08-02 stsp are as follows:
882 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
883 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
884 1ff8e573 2018-08-02 stsp Start traversing history at the specified
885 1ff8e573 2018-08-02 stsp .Ar commit .
886 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
887 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
888 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
889 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
890 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
891 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
892 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
893 1ff8e573 2018-08-02 stsp working directory.
894 0c06baac 2019-02-05 stsp If this directory is a
896 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
899 bc26cce8 2019-08-04 stsp Short alias for
900 bc26cce8 2019-08-04 stsp .Cm blame .
901 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
902 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
903 5de5890b 2018-10-18 stsp directory path in the repository.
904 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
905 db0c2996 2019-02-10 stsp annotations:
906 db0c2996 2019-02-10 stsp .Bl -column YXZ description
907 848d6979 2019-08-12 stsp .It @ Ta entry is a symbolic link
908 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
909 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
910 63c5ca5d 2019-08-24 stsp .It $ Ta entry is a Git submodule
913 0d6c6ee3 2020-05-20 stsp Symbolic link entries are also annotated with the target path of the link.
917 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
918 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
919 0c849583 2019-02-05 stsp if there is no work tree.
921 5de5890b 2018-10-18 stsp The options for
922 5de5890b 2018-10-18 stsp .Cm got tree
923 5de5890b 2018-10-18 stsp are as follows:
924 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
925 5de5890b 2018-10-18 stsp .It Fl c Ar commit
926 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
927 5de5890b 2018-10-18 stsp .Ar commit .
928 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
929 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
930 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
931 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
932 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
933 5de5890b 2018-10-18 stsp Use the repository at the specified path.
934 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
935 5de5890b 2018-10-18 stsp working directory.
936 0c849583 2019-02-05 stsp If this directory is a
938 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
940 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
942 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
945 bc26cce8 2019-08-04 stsp Short alias for
947 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
948 d0eebce4 2019-03-11 stsp Manage references in a repository.
950 e31abbf2 2020-03-22 stsp References may be listed, created, deleted, and changed.
951 e31abbf2 2020-03-22 stsp When creating, deleting, or changing a reference the specified
953 e31abbf2 2020-03-22 stsp must be an absolute reference name, i.e. it must begin with
954 f16e4044 2019-10-09 stsp .Dq refs/ .
956 d0eebce4 2019-03-11 stsp The options for
957 d0eebce4 2019-03-11 stsp .Cm got ref
958 d0eebce4 2019-03-11 stsp are as follows:
959 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
960 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
961 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
962 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
963 d0eebce4 2019-03-11 stsp working directory.
964 d0eebce4 2019-03-11 stsp If this directory is a
966 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
968 b2070a3f 2020-03-22 stsp List references in the repository.
971 b2070a3f 2020-03-22 stsp is specified, list all existing references in the repository.
974 b2070a3f 2020-03-22 stsp is a reference namespace, list all references in this namespace.
975 b2070a3f 2020-03-22 stsp Otherwise, show only the reference with the given
977 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
979 e31abbf2 2020-03-22 stsp .It Fl c Ar object
980 e31abbf2 2020-03-22 stsp Create a reference or change an existing reference.
981 e31abbf2 2020-03-22 stsp The reference with the specified
983 e31abbf2 2020-03-22 stsp will point at the specified
985 e31abbf2 2020-03-22 stsp The expected
987 e31abbf2 2020-03-22 stsp argument is a ID SHA1 hash or an existing reference or tag name which will
988 e31abbf2 2020-03-22 stsp be resolved to the ID of a corresponding commit, tree, tag, or blob object.
989 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
991 e31abbf2 2020-03-22 stsp .It Fl s Ar reference
992 e31abbf2 2020-03-22 stsp Create a symbolic reference, or change an existing symbolic reference.
993 e31abbf2 2020-03-22 stsp The symbolic reference with the specified
995 e31abbf2 2020-03-22 stsp will point at the specified
996 e31abbf2 2020-03-22 stsp .Ar reference
997 e31abbf2 2020-03-22 stsp which must already exist in the repository.
998 d1c1ae5f 2019-08-12 stsp Care should be taken not to create loops between references when
999 d1c1ae5f 2019-08-12 stsp this option is used.
1000 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
1003 e31abbf2 2020-03-22 stsp Delete the reference with the specified
1005 e31abbf2 2020-03-22 stsp from the repository.
1006 601aba22 2021-03-21 stsp Any commit, tree, tag, and blob objects belonging to deleted references
1007 601aba22 2021-03-21 stsp remain in the repository and may be removed separately with
1008 e6786710 2021-07-03 stsp Git's garbage collector or
1009 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
1010 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
1013 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
1014 da76fce2 2020-02-24 stsp Create, list, or delete branches.
1016 34d4e04c 2021-02-08 stsp Local branches are managed via references which live in the
1017 4e759de4 2019-06-26 stsp .Dq refs/heads/
1018 4e759de4 2019-06-26 stsp reference namespace.
1020 4e759de4 2019-06-26 stsp .Cm got branch
1021 2f1457c6 2021-08-27 stsp command creates references in this namespace only.
1023 2f1457c6 2021-08-27 stsp When deleting branches the specified
1025 2f1457c6 2021-08-27 stsp is searched in the
1026 2f1457c6 2021-08-27 stsp .Dq refs/heads
1027 2f1457c6 2021-08-27 stsp reference namespace first.
1028 2f1457c6 2021-08-27 stsp If no corresponding branch is found the
1029 2f1457c6 2021-08-27 stsp .Dq refs/remotes
1030 2f1457c6 2021-08-27 stsp namespace will be searched next.
1032 ad89fa31 2019-10-04 stsp If invoked in a work tree without any arguments, print the name of the
1033 ad89fa31 2019-10-04 stsp work tree's current branch.
1037 a74f7e83 2019-11-10 stsp argument is passed, attempt to create a branch reference with the given name.
1038 a74f7e83 2019-11-10 stsp By default the new branch reference will point at the latest commit on the
1039 a74f7e83 2019-11-10 stsp work tree's current branch if invoked in a work tree, and otherwise to a commit
1040 a74f7e83 2019-11-10 stsp resolved via the repository's HEAD reference.
1042 da76fce2 2020-02-24 stsp If invoked in a work tree, once the branch was created successfully
1043 da76fce2 2020-02-24 stsp switch the work tree's head reference to the newly created branch and
1044 da76fce2 2020-02-24 stsp update files across the entire work tree, just like
1045 da76fce2 2020-02-24 stsp .Cm got update -b Ar name
1047 da76fce2 2020-02-24 stsp Show the status of each affected file, using the following status codes:
1048 da76fce2 2020-02-24 stsp .Bl -column YXZ description
1049 da76fce2 2020-02-24 stsp .It U Ta file was updated and contained no local changes
1050 da76fce2 2020-02-24 stsp .It G Ta file was updated and local changes were merged cleanly
1051 da76fce2 2020-02-24 stsp .It C Ta file was updated and conflicts occurred during merge
1052 da76fce2 2020-02-24 stsp .It D Ta file was deleted
1053 da76fce2 2020-02-24 stsp .It A Ta new file was added
1054 da76fce2 2020-02-24 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
1055 da76fce2 2020-02-24 stsp .It ! Ta a missing versioned file was restored
1058 4e759de4 2019-06-26 stsp The options for
1059 4e759de4 2019-06-26 stsp .Cm got branch
1060 4e759de4 2019-06-26 stsp are as follows:
1061 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
1062 a74f7e83 2019-11-10 stsp .It Fl c Ar commit
1063 a74f7e83 2019-11-10 stsp Make a newly created branch reference point at the specified
1064 a74f7e83 2019-11-10 stsp .Ar commit .
1065 a74f7e83 2019-11-10 stsp The expected
1066 a74f7e83 2019-11-10 stsp .Ar commit
1067 a74f7e83 2019-11-10 stsp argument is a commit ID SHA1 hash or an existing reference
1068 a74f7e83 2019-11-10 stsp or tag name which will be resolved to a commit ID.
1069 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
1070 4e759de4 2019-06-26 stsp Use the repository at the specified path.
1071 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
1072 4e759de4 2019-06-26 stsp working directory.
1073 4e759de4 2019-06-26 stsp If this directory is a
1075 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
1077 34d4e04c 2021-02-08 stsp List all existing branches in the repository, including copies of remote
1078 34d4e04c 2021-02-08 stsp repositories' branches in the
1079 34d4e04c 2021-02-08 stsp .Dq refs/remotes/
1080 34d4e04c 2021-02-08 stsp reference namespace.
1082 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
1083 ba882ee3 2019-07-11 stsp with one the following annotations:
1084 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
1085 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
1086 1dd86744 2019-08-12 anthony .It \(a~ Ta work tree's base commit is out-of-date
1088 4e759de4 2019-06-26 stsp .It Fl d Ar name
1089 2f1457c6 2021-08-27 stsp Delete the branch with the specified
1092 2f1457c6 2021-08-27 stsp .Dq refs/heads
1094 2f1457c6 2021-08-27 stsp .Dq refs/remotes
1095 2f1457c6 2021-08-27 stsp reference namespace.
1097 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
1098 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
1099 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
1100 e6786710 2021-07-03 stsp Git's garbage collector or
1101 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
1103 da76fce2 2020-02-24 stsp Do not switch and update the work tree after creating a new branch.
1106 97b3a7be 2019-07-09 stsp Short alias for
1107 97b3a7be 2019-07-09 stsp .Cm branch .
1108 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
1109 8e7bd50a 2019-08-22 stsp Manage tags in a repository.
1111 8e7bd50a 2019-08-22 stsp Tags are managed via references which live in the
1112 8e7bd50a 2019-08-22 stsp .Dq refs/tags/
1113 8e7bd50a 2019-08-22 stsp reference namespace.
1115 8e7bd50a 2019-08-22 stsp .Cm got tag
1116 8e7bd50a 2019-08-22 stsp command operates on references in this namespace only.
1117 b3cd068e 2019-08-22 stsp References in this namespace point at tag objects which contain a pointer
1118 b3cd068e 2019-08-22 stsp to another object, a tag message, as well as author and timestamp information.
1120 80106605 2020-02-24 stsp Attempt to create a tag with the given
1121 8e7bd50a 2019-08-22 stsp .Ar name ,
1122 8e7bd50a 2019-08-22 stsp and make this tag point at the given
1123 8e7bd50a 2019-08-22 stsp .Ar commit .
1124 8e7bd50a 2019-08-22 stsp If no commit is specified, default to the latest commit on the work tree's
1125 8e7bd50a 2019-08-22 stsp current branch if invoked in a work tree, and to a commit resolved via
1126 8e7bd50a 2019-08-22 stsp the repository's HEAD reference otherwise.
1128 8e7bd50a 2019-08-22 stsp The options for
1129 8e7bd50a 2019-08-22 stsp .Cm got tag
1130 8e7bd50a 2019-08-22 stsp are as follows:
1131 8e7bd50a 2019-08-22 stsp .Bl -tag -width Ds
1132 80106605 2020-02-24 stsp .It Fl c Ar commit
1133 80106605 2020-02-24 stsp Make the newly created tag reference point at the specified
1134 80106605 2020-02-24 stsp .Ar commit .
1135 80106605 2020-02-24 stsp The expected
1136 80106605 2020-02-24 stsp .Ar commit
1137 80106605 2020-02-24 stsp argument is a commit ID SHA1 hash or an existing reference or tag name which
1138 80106605 2020-02-24 stsp will be resolved to a commit ID.
1139 80106605 2020-02-24 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1140 80106605 2020-02-24 stsp automatically, provided the abbreviation is unique.
1141 8e7bd50a 2019-08-22 stsp .It Fl m Ar message
1142 80106605 2020-02-24 stsp Use the specified tag message when creating the new tag.
1143 8e7bd50a 2019-08-22 stsp Without the
1146 3a62228f 2019-11-08 stsp .Cm got tag
1147 8e7bd50a 2019-08-22 stsp opens a temporary file in an editor where a tag message can be written.
1148 8e7bd50a 2019-08-22 stsp .It Fl r Ar repository-path
1149 8e7bd50a 2019-08-22 stsp Use the repository at the specified path.
1150 8e7bd50a 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1151 8e7bd50a 2019-08-22 stsp working directory.
1152 8e7bd50a 2019-08-22 stsp If this directory is a
1154 8e7bd50a 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1156 8e7bd50a 2019-08-22 stsp List all existing tags in the repository instead of creating a new tag.
1157 8e7bd50a 2019-08-22 stsp If this option is used, no other command-line arguments are allowed.
1160 8e7bd50a 2019-08-22 stsp By design, the
1161 8e7bd50a 2019-08-22 stsp .Cm got tag
1162 8e7bd50a 2019-08-22 stsp command will not delete tags or change existing tags.
1163 8e7bd50a 2019-08-22 stsp If a tag must be deleted, the
1164 8e7bd50a 2019-08-22 stsp .Cm got ref
1165 8e7bd50a 2019-08-22 stsp command may be used to delete a tag's reference.
1166 8e7bd50a 2019-08-22 stsp This should only be done if the tag has not already been copied to
1167 8e7bd50a 2019-08-22 stsp another repository.
1168 022fae89 2019-12-06 tracey .It Cm add Oo Fl R Oc Oo Fl I Oc Ar path ...
1169 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
1170 d00136be 2019-03-26 stsp repository in the next commit.
1171 ff56836b 2021-07-08 stsp By default, files which match a
1172 ff56836b 2021-07-08 stsp .Cm got status
1173 ff56836b 2021-07-08 stsp ignore pattern will not be added.
1175 4e68cba3 2019-11-23 stsp The options for
1176 4e68cba3 2019-11-23 stsp .Cm got add
1177 4e68cba3 2019-11-23 stsp are as follows:
1178 4e68cba3 2019-11-23 stsp .Bl -tag -width Ds
1180 4e68cba3 2019-11-23 stsp Permit recursion into directories.
1181 4e68cba3 2019-11-23 stsp If this option is not specified,
1182 4e68cba3 2019-11-23 stsp .Cm got add
1183 4e68cba3 2019-11-23 stsp will refuse to run if a specified
1185 4e68cba3 2019-11-23 stsp is a directory.
1186 022fae89 2019-12-06 tracey .It Fl I
1187 ff56836b 2021-07-08 stsp Add files even if they match a
1188 022fae89 2019-12-06 tracey .Cm got status
1189 022fae89 2019-12-06 tracey ignore pattern.
1191 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 ...
1192 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
1193 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
1195 2ec1f75b 2019-03-26 stsp The options for
1196 86d25a1b 2019-07-11 stsp .Cm got remove
1197 2ec1f75b 2019-03-26 stsp are as follows:
1198 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
1200 bd81cfb7 2020-04-19 stsp Perform the operation even if a file contains local modifications.
1201 70e3e7f5 2019-12-13 tracey .It Fl k
1202 70e3e7f5 2019-12-13 tracey Keep affected files on disk.
1203 f2a9dc41 2019-12-13 tracey .It Fl R
1204 f2a9dc41 2019-12-13 tracey Permit recursion into directories.
1205 f2a9dc41 2019-12-13 tracey If this option is not specified,
1206 f2a9dc41 2019-12-13 tracey .Cm got remove
1207 f2a9dc41 2019-12-13 tracey will refuse to run if a specified
1208 f2a9dc41 2019-12-13 tracey .Ar path
1209 f2a9dc41 2019-12-13 tracey is a directory.
1210 766841c2 2020-08-13 stsp .It Fl s Ar status-codes
1211 766841c2 2020-08-13 stsp Only delete files with a modification status matching one of the
1212 766841c2 2020-08-13 stsp single-character status codes contained in the
1213 766841c2 2020-08-13 stsp .Ar status-codes
1215 766841c2 2020-08-13 stsp The following status codes may be specified:
1216 766841c2 2020-08-13 stsp .Bl -column YXZ description
1217 766841c2 2020-08-13 stsp .It M Ta modified file (this implies the
1220 766841c2 2020-08-13 stsp .It ! Ta versioned file expected on disk but missing
1224 648e4ef7 2019-07-09 stsp Short alias for
1225 648e4ef7 2019-07-09 stsp .Cm remove .
1226 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 ...
1227 bd81cfb7 2020-04-19 stsp Revert any local changes in files at the specified paths in a work tree.
1228 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
1229 1dd86744 2019-08-12 anthony work tree's base commit.
1230 1dd86744 2019-08-12 anthony There is no way to bring discarded changes back after
1231 a129376b 2019-03-28 stsp .Cm got revert !
1233 e20a8b6f 2019-06-04 stsp If a file was added with
1234 a129376b 2019-03-28 stsp .Cm got add
1235 a129376b 2019-03-28 stsp it will become an unversioned file again.
1236 e20a8b6f 2019-06-04 stsp If a file was deleted with
1237 86d25a1b 2019-07-11 stsp .Cm got remove
1238 a129376b 2019-03-28 stsp it will be restored.
1240 0f6d7415 2019-08-08 stsp The options for
1241 0f6d7415 2019-08-08 stsp .Cm got revert
1242 0f6d7415 2019-08-08 stsp are as follows:
1243 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
1245 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
1246 33aa809d 2019-08-08 stsp changes to revert based on
1248 33aa809d 2019-08-08 stsp (revert change),
1250 33aa809d 2019-08-08 stsp (keep change), and
1252 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
1253 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
1254 33aa809d 2019-08-08 stsp modified file content can be reverted.
1255 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
1256 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
1259 33aa809d 2019-08-08 stsp option, read
1264 33aa809d 2019-08-08 stsp responses line-by-line from the specified
1265 33aa809d 2019-08-08 stsp .Ar response-script
1266 33aa809d 2019-08-08 stsp file instead of prompting interactively.
1268 0f6d7415 2019-08-08 stsp Permit recursion into directories.
1269 0f6d7415 2019-08-08 stsp If this option is not specified,
1270 0f6d7415 2019-08-08 stsp .Cm got revert
1271 0f6d7415 2019-08-08 stsp will refuse to run if a specified
1273 0f6d7415 2019-08-08 stsp is a directory.
1276 97b3a7be 2019-07-09 stsp Short alias for
1277 97b3a7be 2019-07-09 stsp .Cm revert .
1278 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 ...
1279 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
1280 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
1283 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
1284 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
1286 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
1287 1dd86744 2019-08-12 anthony .Cm got stage ,
1288 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
1289 4ed9f614 2019-08-04 stsp have not been staged.
1291 28cf319f 2021-01-28 stsp .Cm got commit
1292 28cf319f 2021-01-28 stsp opens a temporary file in an editor where a log message can be written
1293 28cf319f 2021-01-28 stsp unless the
1295 28cf319f 2021-01-28 stsp option is used
1300 28cf319f 2021-01-28 stsp options are used together.
1302 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
1303 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
1304 15cd91f7 2019-05-12 stsp .It M Ta modified file
1305 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
1306 15cd91f7 2019-05-12 stsp .It A Ta new file was added
1307 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
1310 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
1311 996d5ccd 2019-08-05 stsp recorded base commit.
1314 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
1315 15cd91f7 2019-05-12 stsp multiple base commits.
1316 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
1317 47ec7be7 2019-05-12 stsp .Cm got update
1318 47ec7be7 2019-05-12 stsp across the entire work tree.
1321 15cd91f7 2019-05-12 stsp .Cm got commit
1322 15cd91f7 2019-05-12 stsp command requires the
1323 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
1324 aba9c984 2019-09-08 stsp environment variable to be set,
1325 257add31 2020-09-09 stsp unless an author has been configured in
1326 257add31 2020-09-09 stsp .Xr got.conf 5
1328 aba9c984 2019-09-08 stsp .Dv user.name
1330 709ae9eb 2019-09-08 stsp .Dv user.email
1331 709ae9eb 2019-09-08 stsp configuration settings can be
1332 aba9c984 2019-09-08 stsp obtained from the repository's
1333 aba9c984 2019-09-08 stsp .Pa .git/config
1334 c9956ddf 2019-09-08 stsp file or from Git's global
1335 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1336 c9956ddf 2019-09-08 stsp configuration file.
1338 74416c47 2019-05-09 stsp The options for
1339 74416c47 2019-05-09 stsp .Cm got commit
1340 74416c47 2019-05-09 stsp are as follows:
1341 74416c47 2019-05-09 stsp .Bl -tag -width Ds
1342 28cf319f 2021-01-28 stsp .It Fl F Ar path
1343 28cf319f 2021-01-28 stsp Use the prepared log message stored in the file found at
1345 28cf319f 2021-01-28 stsp when creating the new commit.
1346 28cf319f 2021-01-28 stsp .Cm got commit
1347 28cf319f 2021-01-28 stsp opens a temporary file in an editor where the prepared log message can be
1348 28cf319f 2021-01-28 stsp reviewed and edited further if needed.
1349 28cf319f 2021-01-28 stsp Cannot be used together with the
1352 28cf319f 2021-01-28 stsp .It Fl m Ar message
1353 28cf319f 2021-01-28 stsp Use the specified log message when creating the new commit.
1354 28cf319f 2021-01-28 stsp Cannot be used together with the
1358 28cf319f 2021-01-28 stsp This option prevents
1359 23594da9 2019-05-13 stsp .Cm got commit
1360 28cf319f 2021-01-28 stsp from opening the commit message in an editor.
1361 28cf319f 2021-01-28 stsp It has no effect unless it is used together with the
1363 28cf319f 2021-01-28 stsp option and is intended for non-interactive use such as scripting.
1365 af358f55 2020-07-23 stsp Allow the addition of symbolic links which point outside of the path space
1366 af358f55 2020-07-23 stsp that is under version control.
1367 af358f55 2020-07-23 stsp By default,
1368 af358f55 2020-07-23 stsp .Cm got commit
1369 af358f55 2020-07-23 stsp will reject such symbolic links due to safety concerns.
1370 35213c7c 2020-07-23 stsp As a precaution,
1372 af358f55 2020-07-23 stsp may decide to represent such a symbolic link as a regular file which contains
1373 af358f55 2020-07-23 stsp the link's target path, rather than creating an actual symbolic link which
1374 af358f55 2020-07-23 stsp points outside of the work tree.
1375 af358f55 2020-07-23 stsp Use of this option is discouraged because external mechanisms such as
1376 af358f55 2020-07-23 stsp .Dq make obj
1377 af358f55 2020-07-23 stsp are better suited for managing symbolic links to paths not under
1378 af358f55 2020-07-23 stsp version control.
1381 cfce0458 2019-07-28 stsp .Cm got commit
1382 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
1383 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
1384 916f288c 2019-07-30 stsp .Dq refs/heads/
1385 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
1386 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
1387 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
1388 cfce0458 2019-07-28 stsp If a path is found to be out of date,
1389 cfce0458 2019-07-28 stsp .Cm got update
1390 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
1391 cfce0458 2019-07-28 stsp in the repository.
1393 97b3a7be 2019-07-09 stsp Short alias for
1394 97b3a7be 2019-07-09 stsp .Cm commit .
1395 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
1396 f8a36e22 2021-08-26 stsp Send new changes to a remote repository.
1398 f8a36e22 2021-08-26 stsp .Ar remote-repository
1399 f8a36e22 2021-08-26 stsp is specified,
1400 f8a36e22 2021-08-26 stsp .Dq origin
1401 f8a36e22 2021-08-26 stsp will be used.
1402 f8a36e22 2021-08-26 stsp The remote repository's URL is obtained from the corresponding entry in
1403 f8a36e22 2021-08-26 stsp .Xr got.conf 5
1405 f8a36e22 2021-08-26 stsp .Pa config
1406 f8a36e22 2021-08-26 stsp file of the local repository, as created by
1407 f8a36e22 2021-08-26 stsp .Cm got clone .
1409 f8a36e22 2021-08-26 stsp All objects corresponding to new changes will be written to a temporary
1410 f8a36e22 2021-08-26 stsp pack file which is then uploaded to the server.
1411 f8a36e22 2021-08-26 stsp Upon success, references in the
1412 f8a36e22 2021-08-26 stsp .Dq refs/remotes/
1413 f8a36e22 2021-08-26 stsp reference namespace of the local repository will be updated to point at
1414 f8a36e22 2021-08-26 stsp the commits which have been sent.
1416 f8a36e22 2021-08-26 stsp By default, changes will only be sent if they are based on up-to-date
1417 f8a36e22 2021-08-26 stsp copies of relevant branches in the remote repository.
1418 fd44090b 2021-08-26 stsp If any changes to be sent are based on out-of-date copies or would
1419 fd44090b 2021-08-26 stsp otherwise break linear history of existing branches, new changes must
1420 fd44090b 2021-08-26 stsp be fetched from the server with
1421 f8a36e22 2021-08-26 stsp .Cm got fetch
1422 f8a36e22 2021-08-26 stsp and local branches must be rebased with
1423 f8a36e22 2021-08-26 stsp .Cm got rebase
1425 f8a36e22 2021-08-26 stsp .Cm got send
1426 f8a36e22 2021-08-26 stsp can succeed.
1429 fd44090b 2021-08-26 stsp option can be used to make exceptions to these requirements.
1431 f8a36e22 2021-08-26 stsp The options for
1432 f8a36e22 2021-08-26 stsp .Cm got send
1433 f8a36e22 2021-08-26 stsp are as follows:
1434 f8a36e22 2021-08-26 stsp .Bl -tag -width Ds
1436 f8a36e22 2021-08-26 stsp Send all branches from the local repository's
1437 f8a36e22 2021-08-26 stsp .Dq refs/heads/
1438 f8a36e22 2021-08-26 stsp reference namespace.
1441 f8a36e22 2021-08-26 stsp option is equivalent to listing all branches with multiple
1444 f8a36e22 2021-08-26 stsp Cannot be used together with the
1447 f8a36e22 2021-08-26 stsp .It Fl b Ar branch
1448 f8a36e22 2021-08-26 stsp Send the specified
1449 f8a36e22 2021-08-26 stsp .Ar branch
1450 f8a36e22 2021-08-26 stsp from the local repository's
1451 f8a36e22 2021-08-26 stsp .Dq refs/heads/
1452 f8a36e22 2021-08-26 stsp reference namespace.
1453 f8a36e22 2021-08-26 stsp This option may be specified multiple times to build a list of branches
1455 f8a36e22 2021-08-26 stsp If this option is not specified, default to the work tree's current branch
1456 f8a36e22 2021-08-26 stsp if invoked in a work tree, or to the repository's HEAD reference.
1457 f8a36e22 2021-08-26 stsp Cannot be used together with the
1460 f8a36e22 2021-08-26 stsp .It Fl d Ar branch
1461 f8a36e22 2021-08-26 stsp Delete the specified
1462 f8a36e22 2021-08-26 stsp .Ar branch
1463 f8a36e22 2021-08-26 stsp from the remote repository's
1464 f8a36e22 2021-08-26 stsp .Dq refs/heads/
1465 f8a36e22 2021-08-26 stsp reference namespace.
1466 f8a36e22 2021-08-26 stsp This option may be specified multiple times to build a list of branches
1467 f8a36e22 2021-08-26 stsp to delete.
1469 f8a36e22 2021-08-26 stsp Only references are deleted.
1470 f8a36e22 2021-08-26 stsp Any commit, tree, tag, and blob objects belonging to deleted branches
1471 f8a36e22 2021-08-26 stsp may become subject to deletion by Git's garbage collector running on
1472 f8a36e22 2021-08-26 stsp the server.
1474 f8a36e22 2021-08-26 stsp Requesting deletion of branches results in an error if the server
1475 fd44090b 2021-08-26 stsp does not support this feature or disallows the deletion of branches
1476 fd44090b 2021-08-26 stsp based on its configuration.
1478 fd44090b 2021-08-26 stsp Attempt to force the server to overwrite existing branches or tags
1479 fd44090b 2021-08-26 stsp in the remote repository, even when
1480 fd44090b 2021-08-26 stsp .Cm got fetch
1482 fd44090b 2021-08-26 stsp .Cm got rebase
1483 fd44090b 2021-08-26 stsp would usually be required before changes can be sent.
1484 f8a36e22 2021-08-26 stsp The server may reject forced requests regardless, depending on its
1485 f8a36e22 2021-08-26 stsp configuration.
1487 f8a36e22 2021-08-26 stsp Any commit, tree, tag, and blob objects belonging to overwritten branches
1488 f8a36e22 2021-08-26 stsp or tags may become subject to deletion by Git's garbage collector running
1489 f8a36e22 2021-08-26 stsp on the server.
1492 f8a36e22 2021-08-26 stsp .Dq refs/tags
1493 f8a36e22 2021-08-26 stsp reference namespace is globally shared between all repositories.
1494 f8a36e22 2021-08-26 stsp Use of the
1496 f8a36e22 2021-08-26 stsp option to overwrite tags is discouraged because it can lead to
1497 f8a36e22 2021-08-26 stsp inconsistencies between the tags present in different repositories.
1498 f8a36e22 2021-08-26 stsp In general, creating a new tag with a different name is recommended
1499 f8a36e22 2021-08-26 stsp instead of overwriting an existing tag.
1501 f8a36e22 2021-08-26 stsp Use of the
1503 f8a36e22 2021-08-26 stsp option is particularly discouraged if changes being sent are based
1504 f8a36e22 2021-08-26 stsp on an out-of-date copy of a branch in the remote repository.
1505 f8a36e22 2021-08-26 stsp Instead of using the
1507 f8a36e22 2021-08-26 stsp option, new changes should
1508 f8a36e22 2021-08-26 stsp be fetched with
1509 f8a36e22 2021-08-26 stsp .Cm got fetch
1510 f8a36e22 2021-08-26 stsp and local branches should be rebased with
1511 f8a36e22 2021-08-26 stsp .Cm got rebase ,
1512 f8a36e22 2021-08-26 stsp followed by another attempt to send the changes.
1516 f8a36e22 2021-08-26 stsp option should only be needed in situations where the remote repository's
1517 f8a36e22 2021-08-26 stsp copy of a branch or tag is known to be out-of-date and is considered
1518 f8a36e22 2021-08-26 stsp disposable.
1519 f8a36e22 2021-08-26 stsp The risks of creating inconsistencies between different repositories
1520 f8a36e22 2021-08-26 stsp should also be taken into account.
1521 f8a36e22 2021-08-26 stsp .It Fl r Ar repository-path
1522 f8a36e22 2021-08-26 stsp Use the repository at the specified path.
1523 f8a36e22 2021-08-26 stsp If not specified, assume the repository is located at or above the current
1524 f8a36e22 2021-08-26 stsp working directory.
1525 f8a36e22 2021-08-26 stsp If this directory is a
1527 f8a36e22 2021-08-26 stsp work tree, use the repository path associated with this work tree.
1528 f8a36e22 2021-08-26 stsp .It Fl t Ar tag
1529 f8a36e22 2021-08-26 stsp Send the specified
1531 f8a36e22 2021-08-26 stsp from the local repository's
1532 f8a36e22 2021-08-26 stsp .Dq refs/tags/
1533 f8a36e22 2021-08-26 stsp reference namespace, in addition to any branches that are being sent.
1536 f8a36e22 2021-08-26 stsp option may be specified multiple times to build a list of tags to send.
1537 f8a36e22 2021-08-26 stsp No tags will be sent if the
1539 f8a36e22 2021-08-26 stsp option is not used.
1541 f8a36e22 2021-08-26 stsp Raise an error if the specified
1543 f8a36e22 2021-08-26 stsp already exists in the remote repository, unless the
1545 93a300b2 2021-08-26 stsp option is used to overwrite the server's copy of the tag.
1546 f8a36e22 2021-08-26 stsp In general, creating a new tag with a different name is recommended
1547 f8a36e22 2021-08-26 stsp instead of overwriting an existing tag.
1549 f8a36e22 2021-08-26 stsp Cannot be used together with the
1553 f8a36e22 2021-08-26 stsp Attempt to send all tags from the local repository's
1554 f8a36e22 2021-08-26 stsp .Dq refs/tags/
1555 f8a36e22 2021-08-26 stsp reference namespace.
1558 f8a36e22 2021-08-26 stsp option is equivalent to listing all tags with multiple
1561 f8a36e22 2021-08-26 stsp Cannot be used together with the
1565 f8a36e22 2021-08-26 stsp Suppress progress reporting output.
1566 f8a36e22 2021-08-26 stsp The same option will be passed to
1568 f8a36e22 2021-08-26 stsp if applicable.
1570 f8a36e22 2021-08-26 stsp Verbose mode.
1572 f8a36e22 2021-08-26 stsp .Cm got send
1573 f8a36e22 2021-08-26 stsp to print debugging messages to standard error output.
1574 f8a36e22 2021-08-26 stsp The same option will be passed to
1576 f8a36e22 2021-08-26 stsp if applicable.
1577 f8a36e22 2021-08-26 stsp Multiple -v options increase the verbosity.
1578 f8a36e22 2021-08-26 stsp The maximum is 3.
1581 f8a36e22 2021-08-26 stsp Short alias for
1582 f8a36e22 2021-08-26 stsp .Cm send .
1583 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
1584 234035bc 2019-06-01 stsp Merge changes from a single
1585 234035bc 2019-06-01 stsp .Ar commit
1586 234035bc 2019-06-01 stsp into the work tree.
1587 234035bc 2019-06-01 stsp The specified
1588 234035bc 2019-06-01 stsp .Ar commit
1589 a16d97bd 2021-09-02 stsp should be on a different branch than the work tree's base commit.
1590 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
1591 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1592 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
1594 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
1595 234035bc 2019-06-01 stsp .Bl -column YXZ description
1596 234035bc 2019-06-01 stsp .It G Ta file was merged
1597 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
1598 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
1599 234035bc 2019-06-01 stsp .It D Ta file was deleted
1600 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
1601 234035bc 2019-06-01 stsp .It A Ta new file was added
1602 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1603 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1606 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
1607 234035bc 2019-06-01 stsp may be viewed with
1608 234035bc 2019-06-01 stsp .Cm got diff ,
1609 234035bc 2019-06-01 stsp amended manually or with further
1610 234035bc 2019-06-01 stsp .Cm got cherrypick
1612 234035bc 2019-06-01 stsp committed with
1613 234035bc 2019-06-01 stsp .Cm got commit ,
1614 234035bc 2019-06-01 stsp or discarded again with
1615 234035bc 2019-06-01 stsp .Cm got revert .
1617 234035bc 2019-06-01 stsp .Cm got cherrypick
1618 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
1619 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
1620 234035bc 2019-06-01 stsp to a single base commit with
1621 234035bc 2019-06-01 stsp .Cm got update .
1622 69de9dd4 2021-09-03 stsp If any relevant files already contain merge conflicts, these
1623 234035bc 2019-06-01 stsp conflicts must be resolved first.
1625 97b3a7be 2019-07-09 stsp Short alias for
1626 97b3a7be 2019-07-09 stsp .Cm cherrypick .
1627 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
1628 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
1629 5ef14e63 2019-06-02 stsp .Ar commit
1630 5ef14e63 2019-06-02 stsp into the work tree.
1631 5ef14e63 2019-06-02 stsp The specified
1632 5ef14e63 2019-06-02 stsp .Ar commit
1633 a16d97bd 2021-09-02 stsp should be on the same branch as the work tree's base commit.
1634 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
1635 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1636 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
1638 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
1639 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
1640 5ef14e63 2019-06-02 stsp .It G Ta file was merged
1641 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
1642 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
1643 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
1644 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
1645 5ef14e63 2019-06-02 stsp .It A Ta new file was added
1646 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1647 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1650 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
1651 5ef14e63 2019-06-02 stsp which may be viewed with
1652 5ef14e63 2019-06-02 stsp .Cm got diff ,
1653 5ef14e63 2019-06-02 stsp amended manually or with further
1654 778a73c2 2019-07-12 stsp .Cm got backout
1656 5ef14e63 2019-06-02 stsp committed with
1657 5ef14e63 2019-06-02 stsp .Cm got commit ,
1658 5ef14e63 2019-06-02 stsp or discarded again with
1659 5ef14e63 2019-06-02 stsp .Cm got revert .
1661 92228c38 2019-06-02 stsp .Cm got backout
1662 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
1663 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
1664 92228c38 2019-06-02 stsp to a single base commit with
1665 92228c38 2019-06-02 stsp .Cm got update .
1666 69de9dd4 2021-09-03 stsp If any relevant files already contain merge conflicts, these
1667 92228c38 2019-06-02 stsp conflicts must be resolved first.
1669 97b3a7be 2019-07-09 stsp Short alias for
1670 97b3a7be 2019-07-09 stsp .Cm backout .
1671 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
1672 818c7501 2019-07-11 stsp Rebase commits on the specified
1673 818c7501 2019-07-11 stsp .Ar branch
1674 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
1676 818c7501 2019-07-11 stsp .Ar branch
1677 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
1678 bc3056e3 2019-08-18 stsp Rebasing begins with the first descendant commit of the youngest
1679 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
1680 818c7501 2019-07-11 stsp .Ar branch
1681 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
1682 f09e2405 2019-07-11 stsp of the specified
1683 818c7501 2019-07-11 stsp .Ar branch
1684 f09e2405 2019-07-11 stsp has been rebased.
1687 2b6826ba 2020-02-24 stsp .Cm got rebase
1688 2b6826ba 2020-02-24 stsp is used as intended, the specified
1689 2b6826ba 2020-02-24 stsp .Ar branch
1690 c10890ce 2020-02-25 stsp represents a local commit history and may already contain changes
1691 c10890ce 2020-02-25 stsp that are not yet visible in any other repositories.
1692 2b6826ba 2020-02-24 stsp The work tree's current branch, which must be set with
1693 2b6826ba 2020-02-24 stsp .Cm got update -b
1694 2b6826ba 2020-02-24 stsp before starting the
1695 2b6826ba 2020-02-24 stsp .Cm rebase
1696 2b6826ba 2020-02-24 stsp operation, represents a branch from a remote repository which shares
1697 2b6826ba 2020-02-24 stsp a common history with the specified
1698 2b6826ba 2020-02-24 stsp .Ar branch
1699 c10890ce 2020-02-25 stsp but has progressed, and perhaps diverged, due to commits added to the
1700 c10890ce 2020-02-25 stsp remote repository.
1702 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
1703 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
1704 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
1705 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
1706 818c7501 2019-07-11 stsp .Ar branch ,
1707 818c7501 2019-07-11 stsp but with different commit IDs.
1708 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
1709 f09e2405 2019-07-11 stsp the new version of the specified
1710 818c7501 2019-07-11 stsp .Ar branch
1711 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
1713 1795b260 2021-04-02 kn Old commits in their pre-rebase state are automatically backed up in the
1714 e600f124 2021-03-21 stsp .Dq refs/got/backup/rebase
1715 e600f124 2021-03-21 stsp reference namespace.
1716 e600f124 2021-03-21 stsp As long as these references are not removed older versions of rebased
1717 e600f124 2021-03-21 stsp commits will remain in the repository and can be viewed with the
1718 e600f124 2021-03-21 stsp .Cm got rebase -l
1720 e600f124 2021-03-21 stsp Removal of these references makes objects which become unreachable via
1721 e6786710 2021-07-03 stsp any reference subject to removal by Git's garbage collector or
1722 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
1724 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
1725 818c7501 2019-07-11 stsp using the following status codes:
1726 818c7501 2019-07-11 stsp .Bl -column YXZ description
1727 818c7501 2019-07-11 stsp .It G Ta file was merged
1728 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
1729 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
1730 818c7501 2019-07-11 stsp .It D Ta file was deleted
1731 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
1732 818c7501 2019-07-11 stsp .It A Ta new file was added
1733 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1734 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1737 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
1738 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
1739 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
1740 818c7501 2019-07-11 stsp .Ar branch
1741 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
1743 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
1744 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
1745 f09e2405 2019-07-11 stsp when the rebase operation continues.
1747 818c7501 2019-07-11 stsp .Cm got rebase
1748 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
1749 a85446b2 2020-01-04 stsp If the work tree is not yet fully updated to the tip commit of its
1750 a85446b2 2020-01-04 stsp branch then the work tree must first be updated with
1751 818c7501 2019-07-11 stsp .Cm got update .
1752 4ed9f614 2019-08-04 stsp If changes have been staged with
1753 4ed9f614 2019-08-04 stsp .Cm got stage ,
1754 bc3056e3 2019-08-18 stsp these changes must first be committed with
1755 4ed9f614 2019-08-04 stsp .Cm got commit
1756 4ed9f614 2019-08-04 stsp or unstaged with
1757 4ed9f614 2019-08-04 stsp .Cm got unstage .
1758 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
1759 f09e2405 2019-07-11 stsp committed with
1760 f09e2405 2019-07-11 stsp .Cm got commit
1761 f09e2405 2019-07-11 stsp or reverted with
1762 f09e2405 2019-07-11 stsp .Cm got revert .
1764 64c6d990 2019-07-11 stsp .Ar branch
1765 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
1766 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
1769 7d5807f4 2019-07-11 stsp .Cm got update
1771 7d5807f4 2019-07-11 stsp .Cm got commit
1772 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
1773 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
1774 7d5807f4 2019-07-11 stsp conflict resolution purposes.
1776 818c7501 2019-07-11 stsp The options for
1777 818c7501 2019-07-11 stsp .Cm got rebase
1778 818c7501 2019-07-11 stsp are as follows:
1779 818c7501 2019-07-11 stsp .Bl -tag -width Ds
1781 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
1782 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1784 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
1785 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1787 e600f124 2021-03-21 stsp Show a list of past rebase operations, represented by references in the
1788 e600f124 2021-03-21 stsp .Dq refs/got/backup/rebase
1789 e600f124 2021-03-21 stsp reference namespace.
1791 e600f124 2021-03-21 stsp Display the author, date, and log message of each backed up commit,
1792 e600f124 2021-03-21 stsp the object ID of the corresponding post-rebase commit, and
1793 e600f124 2021-03-21 stsp the object ID of their common ancestor commit.
1794 e600f124 2021-03-21 stsp Given these object IDs,
1796 e600f124 2021-03-21 stsp .Cm got log
1797 e600f124 2021-03-21 stsp command with the
1801 e600f124 2021-03-21 stsp options can be used to examine the history of either version of the branch,
1803 e600f124 2021-03-21 stsp .Cm got branch
1804 e600f124 2021-03-21 stsp command with the
1806 e600f124 2021-03-21 stsp option can be used to create a new branch from a pre-rebase state if desired.
1809 e600f124 2021-03-21 stsp .Ar branch
1810 e600f124 2021-03-21 stsp is specified, only show commits which at some point in time represented this
1812 e600f124 2021-03-21 stsp Otherwise, list all backed up commits for any branches.
1814 e600f124 2021-03-21 stsp If this option is used,
1815 e600f124 2021-03-21 stsp .Cm got rebase
1816 e600f124 2021-03-21 stsp does not require a work tree.
1817 e600f124 2021-03-21 stsp None of the other options can be used together with
1820 643b85bc 2021-07-16 stsp Delete backups created by past rebase operations, represented by references
1822 643b85bc 2021-07-16 stsp .Dq refs/got/backup/rebase
1823 643b85bc 2021-07-16 stsp reference namespace.
1826 643b85bc 2021-07-16 stsp .Ar branch
1827 643b85bc 2021-07-16 stsp is specified, only delete backups which at some point in time represented
1828 643b85bc 2021-07-16 stsp this branch.
1829 643b85bc 2021-07-16 stsp Otherwise, delete all references found within
1830 643b85bc 2021-07-16 stsp .Dq refs/got/backup/rebase .
1832 643b85bc 2021-07-16 stsp Any commit, tree, tag, and blob objects belonging to deleted backups
1833 643b85bc 2021-07-16 stsp remain in the repository and may be removed separately with
1834 643b85bc 2021-07-16 stsp Git's garbage collector or
1835 643b85bc 2021-07-16 stsp .Cm gotadmin cleanup .
1837 643b85bc 2021-07-16 stsp If this option is used,
1838 643b85bc 2021-07-16 stsp .Cm got rebase
1839 643b85bc 2021-07-16 stsp does not require a work tree.
1840 643b85bc 2021-07-16 stsp None of the other options can be used together with
1844 818c7501 2019-07-11 stsp Short alias for
1845 818c7501 2019-07-11 stsp .Cm rebase .
1846 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
1847 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
1848 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
1850 6e54d307 2020-02-24 stsp Before starting a
1851 6e54d307 2020-02-24 stsp .Cm histedit
1852 6e54d307 2020-02-24 stsp operation the work tree's current branch must be set with
1853 6e54d307 2020-02-24 stsp .Cm got update -b
1854 6e54d307 2020-02-24 stsp to the branch which should be edited, unless this branch is already the
1855 6e54d307 2020-02-24 stsp current branch of the work tree.
1856 6e54d307 2020-02-24 stsp The tip of this branch represents the upper bound (inclusive) of commits
1857 6e54d307 2020-02-24 stsp touched by the
1858 6e54d307 2020-02-24 stsp .Cm histedit
1859 6e54d307 2020-02-24 stsp operation.
1861 6e54d307 2020-02-24 stsp Furthermore, the work tree's base commit
1862 6e54d307 2020-02-24 stsp must be set with
1863 6e54d307 2020-02-24 stsp .Cm got update -c
1864 6e54d307 2020-02-24 stsp to a point in this branch's commit history where editing should begin.
1865 6e54d307 2020-02-24 stsp This commit represents the lower bound (non-inclusive) of commits touched
1867 6e54d307 2020-02-24 stsp .Cm histedit
1868 6e54d307 2020-02-24 stsp operation.
1870 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
1871 0ebf8283 2019-07-24 stsp .Ar histedit script
1872 46fa4c83 2020-02-24 stsp which can be written in an editor based on a template, passed on the
1873 46fa4c83 2020-02-24 stsp command line, or generated with the
1879 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
1880 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
1881 0ebf8283 2019-07-24 stsp whitespace and an argument.
1882 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
1883 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
1884 0ebf8283 2019-07-24 stsp Lines which begin with the
1886 0ebf8283 2019-07-24 stsp character are ignored entirely.
1888 0ebf8283 2019-07-24 stsp The available commands are as follows:
1889 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
1890 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
1891 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
1892 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
1893 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
1894 0ebf8283 2019-07-24 stsp listed further below that will be used.
1895 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
1896 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
1897 0ebf8283 2019-07-24 stsp the commit on the previous line.
1898 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
1899 0ebf8283 2019-07-24 stsp log message can be written.
1902 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
1903 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
1904 5b87815e 2020-03-05 stsp No commit may be listed more than once.
1906 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
1907 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
1908 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
1909 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
1910 498a90b7 2019-07-25 stsp switched to it.
1912 1795b260 2021-04-02 kn Old commits in their pre-histedit state are automatically backed up in the
1913 e600f124 2021-03-21 stsp .Dq refs/got/backup/histedit
1914 e600f124 2021-03-21 stsp reference namespace.
1915 e600f124 2021-03-21 stsp As long as these references are not removed older versions of edited
1916 e600f124 2021-03-21 stsp commits will remain in the repository and can be viewed with the
1917 e600f124 2021-03-21 stsp .Cm got histedit -l
1919 e600f124 2021-03-21 stsp Removal of these references makes objects which become unreachable via
1920 e6786710 2021-07-03 stsp any reference subject to removal by Git's garbage collector or
1921 e6786710 2021-07-03 stsp .Cm gotadmin cleanup .
1923 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
1924 0ebf8283 2019-07-24 stsp using the following status codes:
1925 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
1926 0ebf8283 2019-07-24 stsp .It G Ta file was merged
1927 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
1928 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
1929 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
1930 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
1931 0ebf8283 2019-07-24 stsp .It A Ta new file was added
1932 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1933 c90c8ce3 2020-07-23 stsp .It ? Ta changes destined for an unversioned file were not merged
1936 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
1937 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
1938 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
1939 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
1941 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
1942 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
1943 0ebf8283 2019-07-24 stsp when the histedit operation continues.
1945 0ebf8283 2019-07-24 stsp .Cm got histedit
1946 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
1947 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
1948 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
1949 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
1950 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
1951 0ebf8283 2019-07-24 stsp to a single base commit with
1952 0ebf8283 2019-07-24 stsp .Cm got update .
1953 4ed9f614 2019-08-04 stsp If changes have been staged with
1954 4ed9f614 2019-08-04 stsp .Cm got stage ,
1955 bc3056e3 2019-08-18 stsp these changes must first be committed with
1956 4ed9f614 2019-08-04 stsp .Cm got commit
1957 4ed9f614 2019-08-04 stsp or unstaged with
1958 4ed9f614 2019-08-04 stsp .Cm got unstage .
1959 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
1960 0ebf8283 2019-07-24 stsp committed with
1961 0ebf8283 2019-07-24 stsp .Cm got commit
1962 0ebf8283 2019-07-24 stsp or reverted with
1963 0ebf8283 2019-07-24 stsp .Cm got revert .
1964 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
1965 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
1968 7ef62c4e 2020-02-24 stsp .Cm got update ,
1969 7ef62c4e 2020-02-24 stsp .Cm got rebase ,
1971 65db4ffb 2020-02-24 stsp .Cm got integrate
1972 65db4ffb 2020-02-24 stsp commands will refuse to run while a histedit operation is in progress.
1973 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
1974 0ebf8283 2019-07-24 stsp .Cm got commit
1975 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
1976 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
1978 0ebf8283 2019-07-24 stsp The options for
1979 0ebf8283 2019-07-24 stsp .Cm got histedit
1980 0ebf8283 2019-07-24 stsp are as follows:
1981 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
1983 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
1984 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1986 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
1987 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1989 466785b9 2020-12-10 jrick Fold all commits into a single commit.
1990 466785b9 2020-12-10 jrick This option is a quick equivalent to a histedit script which folds all
1991 466785b9 2020-12-10 jrick commits, combining them all into one commit.
1994 2a78779e 2020-12-11 stsp option can only be used when starting a new histedit operation.
1995 466785b9 2020-12-10 jrick If this option is used, no other command-line arguments are allowed.
1996 ddbfac99 2020-02-24 stsp .It Fl F Ar histedit-script
1997 ddbfac99 2020-02-24 stsp Use the specified
1998 ddbfac99 2020-02-24 stsp .Ar histedit-script
1999 ddbfac99 2020-02-24 stsp instead of opening a temporary file in an editor where a histedit script
2000 ddbfac99 2020-02-24 stsp can be written.
2002 083957f4 2020-02-24 stsp Edit log messages only.
2003 083957f4 2020-02-24 stsp This option is a quick equivalent to a histedit script which edits
2004 2bdefe56 2020-02-24 tracey only log messages but otherwise leaves every picked commit as-is.
2007 083957f4 2020-02-24 stsp option can only be used when starting a new histedit operation.
2008 083957f4 2020-02-24 stsp If this option is used, no other command-line arguments are allowed.
2010 e600f124 2021-03-21 stsp Show a list of past histedit operations, represented by references in the
2011 e600f124 2021-03-21 stsp .Dq refs/got/backup/histedit
2012 e600f124 2021-03-21 stsp reference namespace.
2014 e600f124 2021-03-21 stsp Display the author, date, and log message of each backed up commit,
2015 e600f124 2021-03-21 stsp the object ID of the corresponding post-histedit commit, and
2016 e600f124 2021-03-21 stsp the object ID of their common ancestor commit.
2017 e600f124 2021-03-21 stsp Given these object IDs,
2019 e600f124 2021-03-21 stsp .Cm got log
2020 e600f124 2021-03-21 stsp command with the
2024 e600f124 2021-03-21 stsp options can be used to examine the history of either version of the branch,
2026 e600f124 2021-03-21 stsp .Cm got branch
2027 e600f124 2021-03-21 stsp command with the
2029 e600f124 2021-03-21 stsp option can be used to create a new branch from a pre-histedit state if desired.
2032 e600f124 2021-03-21 stsp .Ar branch
2033 e600f124 2021-03-21 stsp is specified, only show commits which at some point in time represented this
2035 e600f124 2021-03-21 stsp Otherwise, list all backed up commits for any branches.
2037 e600f124 2021-03-21 stsp If this option is used,
2038 e600f124 2021-03-21 stsp .Cm got histedit
2039 e600f124 2021-03-21 stsp does not require a work tree.
2040 e600f124 2021-03-21 stsp None of the other options can be used together with
2043 643b85bc 2021-07-16 stsp Delete backups created by past histedit operations, represented by references
2045 643b85bc 2021-07-16 stsp .Dq refs/got/backup/histedit
2046 643b85bc 2021-07-16 stsp reference namespace.
2049 643b85bc 2021-07-16 stsp .Ar branch
2050 643b85bc 2021-07-16 stsp is specified, only delete backups which at some point in time represented
2051 643b85bc 2021-07-16 stsp this branch.
2052 643b85bc 2021-07-16 stsp Otherwise, delete all references found within
2053 643b85bc 2021-07-16 stsp .Dq refs/got/backup/histedit .
2055 643b85bc 2021-07-16 stsp Any commit, tree, tag, and blob objects belonging to deleted backups
2056 643b85bc 2021-07-16 stsp remain in the repository and may be removed separately with
2057 643b85bc 2021-07-16 stsp Git's garbage collector or
2058 643b85bc 2021-07-16 stsp .Cm gotadmin cleanup .
2060 643b85bc 2021-07-16 stsp If this option is used,
2061 643b85bc 2021-07-16 stsp .Cm got histedit
2062 643b85bc 2021-07-16 stsp does not require a work tree.
2063 643b85bc 2021-07-16 stsp None of the other options can be used together with
2067 0ebf8283 2019-07-24 stsp Short alias for
2068 0ebf8283 2019-07-24 stsp .Cm histedit .
2069 2822a352 2019-10-15 stsp .It Cm integrate Ar branch
2070 2822a352 2019-10-15 stsp Integrate the specified
2071 2822a352 2019-10-15 stsp .Ar branch
2072 2822a352 2019-10-15 stsp into the work tree's current branch.
2073 2822a352 2019-10-15 stsp Files in the work tree are updated to match the contents on the integrated
2074 2822a352 2019-10-15 stsp .Ar branch ,
2075 2822a352 2019-10-15 stsp and the reference of the work tree's branch is changed to point at the
2076 2822a352 2019-10-15 stsp head commit of the integrated
2077 2822a352 2019-10-15 stsp .Ar branch .
2079 2822a352 2019-10-15 stsp Both branches can be considered equivalent after integration since they
2080 2822a352 2019-10-15 stsp will be pointing at the same commit.
2081 2822a352 2019-10-15 stsp Both branches remain available for future work, if desired.
2082 2822a352 2019-10-15 stsp In case the integrated
2083 2822a352 2019-10-15 stsp .Ar branch
2084 2822a352 2019-10-15 stsp is no longer needed it may be deleted with
2085 2822a352 2019-10-15 stsp .Cm got branch -d .
2087 2822a352 2019-10-15 stsp Show the status of each affected file, using the following status codes:
2088 2822a352 2019-10-15 stsp .Bl -column YXZ description
2089 2822a352 2019-10-15 stsp .It U Ta file was updated
2090 2822a352 2019-10-15 stsp .It D Ta file was deleted
2091 2822a352 2019-10-15 stsp .It A Ta new file was added
2092 2822a352 2019-10-15 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
2093 2822a352 2019-10-15 stsp .It ! Ta a missing versioned file was restored
2096 2822a352 2019-10-15 stsp .Cm got integrate
2097 2822a352 2019-10-15 stsp will refuse to run if certain preconditions are not met.
2098 2822a352 2019-10-15 stsp Most importantly, the
2099 2822a352 2019-10-15 stsp .Ar branch
2100 2822a352 2019-10-15 stsp must have been rebased onto the work tree's current branch with
2101 2822a352 2019-10-15 stsp .Cm got rebase
2102 2822a352 2019-10-15 stsp before it can be integrated, in order to linearize commit history and
2103 2822a352 2019-10-15 stsp resolve merge conflicts.
2104 2822a352 2019-10-15 stsp If the work tree contains multiple base commits it must first be updated
2105 2822a352 2019-10-15 stsp to a single base commit with
2106 2822a352 2019-10-15 stsp .Cm got update .
2107 2822a352 2019-10-15 stsp If changes have been staged with
2108 2822a352 2019-10-15 stsp .Cm got stage ,
2109 2822a352 2019-10-15 stsp these changes must first be committed with
2110 2822a352 2019-10-15 stsp .Cm got commit
2111 2822a352 2019-10-15 stsp or unstaged with
2112 2822a352 2019-10-15 stsp .Cm got unstage .
2113 2822a352 2019-10-15 stsp If the work tree contains local changes, these changes must first be
2114 2822a352 2019-10-15 stsp committed with
2115 2822a352 2019-10-15 stsp .Cm got commit
2116 2822a352 2019-10-15 stsp or reverted with
2117 2822a352 2019-10-15 stsp .Cm got revert .
2119 2822a352 2019-10-15 stsp Short alias for
2120 2822a352 2019-10-15 stsp .Cm integrate .
2121 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 ...
2122 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
2125 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
2126 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
2127 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
2128 4ed9f614 2019-08-04 stsp .Cm got status .
2130 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
2131 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
2132 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
2133 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
2134 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
2137 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
2138 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
2139 9d8b19a4 2019-08-04 stsp committed.
2141 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
2142 4ed9f614 2019-08-04 stsp .Cm got commit ,
2143 4ed9f614 2019-08-04 stsp .Cm got status ,
2145 4ed9f614 2019-08-04 stsp .Cm got diff .
2146 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
2147 4ed9f614 2019-08-04 stsp .Cm got commit
2148 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
2149 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
2150 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
2152 4ed9f614 2019-08-04 stsp .Cm got status
2153 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
2155 4ed9f614 2019-08-04 stsp .Cm got diff
2156 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
2157 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
2159 4ed9f614 2019-08-04 stsp .Cm got revert
2160 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
2161 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
2163 4ed9f614 2019-08-04 stsp The options for
2164 4ed9f614 2019-08-04 stsp .Cm got stage
2165 4ed9f614 2019-08-04 stsp are as follows:
2166 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
2168 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
2169 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
2170 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
2171 1dd86744 2019-08-12 anthony among the specified paths.
2172 1dd86744 2019-08-12 anthony Otherwise, show all staged paths.
2174 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
2175 dc424a06 2019-08-07 stsp select or reject changes for staging based on
2177 6d23ec10 2019-08-08 stsp (stage change),
2179 6d23ec10 2019-08-08 stsp (reject change), and
2181 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
2182 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
2183 dc424a06 2019-08-07 stsp modified file content can be staged.
2184 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
2185 6d23ec10 2019-08-08 stsp their entirety.
2186 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
2189 3a070a2b 2019-08-07 stsp option, read
2194 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
2195 0e2f5884 2019-08-07 stsp .Ar response-script
2196 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
2198 af358f55 2020-07-23 stsp Allow staging of symbolic links which point outside of the path space
2199 af358f55 2020-07-23 stsp that is under version control.
2200 af358f55 2020-07-23 stsp By default,
2201 af358f55 2020-07-23 stsp .Cm got stage
2202 af358f55 2020-07-23 stsp will reject such symbolic links due to safety concerns.
2203 35213c7c 2020-07-23 stsp As a precaution,
2205 af358f55 2020-07-23 stsp may decide to represent such a symbolic link as a regular file which contains
2206 af358f55 2020-07-23 stsp the link's target path, rather than creating an actual symbolic link which
2207 af358f55 2020-07-23 stsp points outside of the work tree.
2208 af358f55 2020-07-23 stsp Use of this option is discouraged because external mechanisms such as
2209 af358f55 2020-07-23 stsp .Dq make obj
2210 af358f55 2020-07-23 stsp are better suited for managing symbolic links to paths not under
2211 af358f55 2020-07-23 stsp version control.
2214 4ed9f614 2019-08-04 stsp .Cm got stage
2215 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
2216 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
2217 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
2218 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
2219 4ed9f614 2019-08-04 stsp .Cm got update
2220 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
2221 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
2224 4ed9f614 2019-08-04 stsp .Cm got update ,
2225 4ed9f614 2019-08-04 stsp .Cm got rebase ,
2227 4ed9f614 2019-08-04 stsp .Cm got histedit
2228 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
2229 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
2230 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
2231 4ed9f614 2019-08-04 stsp .Cm got unstage
2232 4ed9f614 2019-08-04 stsp before it can be updated with
2233 4ed9f614 2019-08-04 stsp .Cm got update ,
2234 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
2236 4ed9f614 2019-08-04 stsp Short alias for
2237 4ed9f614 2019-08-04 stsp .Cm stage .
2238 dfc23429 2019-08-11 stsp .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
2239 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
2240 4ed9f614 2019-08-04 stsp back into non-staged status.
2243 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
2244 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
2246 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
2247 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
2248 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
2249 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
2250 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
2251 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
2252 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
2253 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
2256 2e1f37b0 2019-08-08 stsp The options for
2257 2e1f37b0 2019-08-08 stsp .Cm got unstage
2258 2e1f37b0 2019-08-08 stsp are as follows:
2259 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
2261 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
2262 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
2264 2e1f37b0 2019-08-08 stsp (unstage change),
2266 2e1f37b0 2019-08-08 stsp (keep change staged), and
2268 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
2269 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
2270 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
2271 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
2272 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
2275 2e1f37b0 2019-08-08 stsp option, read
2280 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
2281 2e1f37b0 2019-08-08 stsp .Ar response-script
2282 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
2285 4ed9f614 2019-08-04 stsp Short alias for
2286 4ed9f614 2019-08-04 stsp .Cm unstage .
2287 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 ...
2288 896e9b6f 2019-08-26 stsp Parse and print contents of objects to standard output in a line-based
2289 896e9b6f 2019-08-26 stsp text format.
2290 896e9b6f 2019-08-26 stsp Content of commit, tree, and tag objects is printed in a way similar
2291 896e9b6f 2019-08-26 stsp to the actual content stored in such objects.
2292 896e9b6f 2019-08-26 stsp Blob object contents are printed as they would appear in files on disk.
2294 896e9b6f 2019-08-26 stsp Attempt to interpret each argument as a reference, a tag name, or
2295 896e9b6f 2019-08-26 stsp an object ID SHA1 hash.
2296 01073a5d 2019-08-22 stsp References will be resolved to an object ID.
2297 01073a5d 2019-08-22 stsp Tag names will resolved to a tag object.
2298 01073a5d 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
2299 01073a5d 2019-08-22 stsp automatically, provided the abbreviation is unique.
2301 896e9b6f 2019-08-26 stsp If none of the above interpretations produce a valid result, or if the
2303 896e9b6f 2019-08-26 stsp option is used, attempt to interpret the argument as a path which will
2304 896e9b6f 2019-08-26 stsp be resolved to the ID of an object found at this path in the repository.
2306 01073a5d 2019-08-22 stsp The options for
2307 01073a5d 2019-08-22 stsp .Cm got cat
2308 01073a5d 2019-08-22 stsp are as follows:
2309 01073a5d 2019-08-22 stsp .Bl -tag -width Ds
2310 896e9b6f 2019-08-26 stsp .It Fl c Ar commit
2311 896e9b6f 2019-08-26 stsp Look up paths in the specified
2312 896e9b6f 2019-08-26 stsp .Ar commit .
2313 896e9b6f 2019-08-26 stsp If this option is not used, paths are looked up in the commit resolved
2314 896e9b6f 2019-08-26 stsp via the repository's HEAD reference.
2315 896e9b6f 2019-08-26 stsp The expected argument is a commit ID SHA1 hash or an existing reference
2316 896e9b6f 2019-08-26 stsp or tag name which will be resolved to a commit ID.
2317 896e9b6f 2019-08-26 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
2318 896e9b6f 2019-08-26 stsp automatically, provided the abbreviation is unique.
2319 01073a5d 2019-08-22 stsp .It Fl r Ar repository-path
2320 01073a5d 2019-08-22 stsp Use the repository at the specified path.
2321 01073a5d 2019-08-22 stsp If not specified, assume the repository is located at or above the current
2322 01073a5d 2019-08-22 stsp working directory.
2323 01073a5d 2019-08-22 stsp If this directory is a
2325 01073a5d 2019-08-22 stsp work tree, use the repository path associated with this work tree.
2327 896e9b6f 2019-08-26 stsp Interpret all arguments as paths only.
2328 896e9b6f 2019-08-26 stsp This option can be used to resolve ambiguity in cases where paths
2329 896e9b6f 2019-08-26 stsp look like tag names, reference names, or object IDs.
2331 b2118c49 2020-07-28 stsp .It Cm info Op Ar path ...
2332 b2118c49 2020-07-28 stsp Display meta-data stored in a work tree.
2334 b2118c49 2020-07-28 stsp .Xr got-worktree 5
2335 b2118c49 2020-07-28 stsp for details.
2337 b2118c49 2020-07-28 stsp The work tree to use is resolved implicitly by walking upwards from the
2338 b2118c49 2020-07-28 stsp current working directory.
2340 b2118c49 2020-07-28 stsp If one or more
2342 b2118c49 2020-07-28 stsp arguments are specified, show additional per-file information for tracked
2343 b2118c49 2020-07-28 stsp files located at or within these paths.
2346 b2118c49 2020-07-28 stsp argument corresponds to the work tree's root directory, display information
2347 b2118c49 2020-07-28 stsp for all tracked files.
2349 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
2350 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
2351 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
2352 74416c47 2019-05-09 stsp The author's name and email address for
2353 21a44f98 2019-07-15 stsp .Cm got commit
2355 21a44f98 2019-07-15 stsp .Cm got import ,
2356 74416c47 2019-05-09 stsp for example:
2357 aba9c984 2019-09-08 stsp .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
2360 84792843 2019-08-09 stsp may fail to parse commits without an email address in author data,
2362 84792843 2019-08-09 stsp attempts to reject
2363 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
2364 84792843 2019-08-09 stsp environment variables with a missing email address.
2366 93a300b2 2021-08-26 stsp .Ev GOT_AUTHOR will be overridden by configuration settings in
2367 50b0790e 2020-09-11 stsp .Xr got.conf 5
2368 50b0790e 2020-09-11 stsp or by Git's
2369 aba9c984 2019-09-08 stsp .Dv user.name
2371 709ae9eb 2019-09-08 stsp .Dv user.email
2372 709ae9eb 2019-09-08 stsp configuration settings in the repository's
2373 aba9c984 2019-09-08 stsp .Pa .git/config
2376 c9956ddf 2019-09-08 stsp .Dv user.name
2378 c9956ddf 2019-09-08 stsp .Dv user.email
2379 c9956ddf 2019-09-08 stsp configuration settings contained in Git's global
2380 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
2381 257add31 2020-09-09 stsp configuration file will only be used if neither
2382 257add31 2020-09-09 stsp .Xr got.conf 5
2384 c9956ddf 2019-09-08 stsp .Ev GOT_AUTHOR
2385 257add31 2020-09-09 stsp environment variable provide author information.
2386 1dd86744 2019-08-12 anthony .It Ev VISUAL , EDITOR
2387 23594da9 2019-05-13 stsp The editor spawned by
2388 8e7bd50a 2019-08-22 stsp .Cm got commit ,
2389 46215d2a 2020-09-11 stsp .Cm got histedit ,
2390 8e7bd50a 2019-08-22 stsp .Cm got import ,
2392 8e7bd50a 2019-08-22 stsp .Cm got tag .
2393 5b735925 2020-09-15 stsp If not set, the
2395 5b735925 2020-09-15 stsp text editor will be spawned in order to give
2397 5b735925 2020-09-15 stsp the attention it deserves.
2398 b1ebc001 2019-08-13 stsp .It Ev GOT_LOG_DEFAULT_LIMIT
2399 b1ebc001 2019-08-13 stsp The default limit on the number of commits traversed by
2400 b1ebc001 2019-08-13 stsp .Cm got log .
2401 b1ebc001 2019-08-13 stsp If set to zero, the limit is unbounded.
2402 b1ebc001 2019-08-13 stsp This variable will be silently ignored if it is set to a non-numeric value.
2405 257add31 2020-09-09 stsp .Bl -tag -width packed-refs -compact
2406 257add31 2020-09-09 stsp .It Pa got.conf
2407 257add31 2020-09-09 stsp Repository-wide configuration settings for
2409 50b0790e 2020-09-11 stsp If present, a
2410 50b0790e 2020-09-11 stsp .Xr got.conf 5
2411 50b0790e 2020-09-11 stsp configuration file located in the root directory of a Git repository
2412 50b0790e 2020-09-11 stsp supersedes any relevant settings in Git's
2413 257add31 2020-09-09 stsp .Pa config
2416 50b0790e 2020-09-11 stsp .It Pa .got/got.conf
2417 50b0790e 2020-09-11 stsp Worktree-specific configuration settings for
2419 50b0790e 2020-09-11 stsp If present, a
2420 1795b260 2021-04-02 kn .Xr got.conf 5
2421 50b0790e 2020-09-11 stsp configuration file in the
2423 50b0790e 2020-09-11 stsp meta-data directory of a work tree supersedes any relevant settings in
2424 50b0790e 2020-09-11 stsp the repository's
2425 50b0790e 2020-09-11 stsp .Xr got.conf 5
2426 50b0790e 2020-09-11 stsp configuration file and Git's
2427 50b0790e 2020-09-11 stsp .Pa config
2430 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
2431 5c860e29 2018-03-12 stsp .Ex -std got
2432 97925469 2018-03-17 stsp .Sh EXAMPLES
2433 43e4eb1b 2021-08-29 stsp Enable tab-completion of
2435 43e4eb1b 2021-08-29 stsp command names in
2436 43e4eb1b 2021-08-29 stsp .Xr ksh 1 :
2438 e1d27370 2021-09-01 stsp .Dl $ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
2440 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
2443 fd039d72 2020-03-18 stsp .Dl $ cd /var/git/
2444 fd039d72 2020-03-18 stsp .Dl $ got clone ssh://git@github.com/openbsd/src.git
2446 fd039d72 2020-03-18 stsp Use of HTTP URLs currently requires
2447 fa6e0e48 2019-05-23 stsp .Xr git 1 :
2449 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
2450 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
2452 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
2454 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
2455 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
2456 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
2458 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
2459 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
2461 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
2463 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
2465 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
2467 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
2469 081470ac 2020-08-13 stsp In a work tree, display files in a potentially problematic state:
2471 081470ac 2020-08-13 stsp .Dl $ got status -s 'C!~?'
2473 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
2475 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
2477 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
2479 4e759de4 2019-06-26 stsp .Dl $ got branch -l
2481 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
2482 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
2483 d83d9d5c 2019-05-13 stsp which is forked off the
2484 d83d9d5c 2019-05-13 stsp .Dq master
2487 7b4f1fcb 2021-01-27 stsp .Dl $ got branch -c master unified-buffer-cache
2489 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
2490 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
2491 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
2493 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
2495 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
2496 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
2498 fa6e0e48 2019-05-23 stsp .Dl $ got commit
2500 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
2501 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
2502 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
2504 48c8c60d 2020-01-27 stsp .Dl $ got log -p -l 3
2506 3d0ac559 2020-04-18 stsp As above, but display changes in the order in which
2507 04e9dcf3 2020-04-18 stsp .Xr patch 1
2508 04e9dcf3 2020-04-18 stsp could apply them in sequence:
2510 04e9dcf3 2020-04-18 stsp .Dl $ got log -p -l 3 -R
2512 5b666081 2020-02-24 stsp In a work tree or a git repository directory, log the history of a subdirectory:
2514 5b666081 2020-02-24 stsp .Dl $ got log sys/uvm
2516 5b666081 2020-02-24 stsp While operating inside a work tree, paths are specified relative to the current
2517 5b666081 2020-02-24 stsp working directory, so this command will log the subdirectory
2518 5b666081 2020-02-24 stsp .Pa sys/uvm :
2520 cf07f22b 2020-07-25 stsp .Dl $ cd sys/uvm && got log\ .
2522 5b666081 2020-02-24 stsp And this command has the same effect:
2524 5b666081 2020-02-24 stsp .Dl $ cd sys/dev/usb && got log ../../uvm
2526 b2118c49 2020-07-28 stsp And this command displays work tree meta-data about all tracked files:
2528 b2118c49 2020-07-28 stsp .Dl $ cd /usr/src
2529 b2118c49 2020-07-28 stsp .Dl $ got info\ . | less
2531 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
2533 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
2534 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
2536 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
2537 e70c17ce 2019-05-22 stsp with a pre-defined log message.
2539 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
2541 bcbc2272 2020-05-20 stsp Alternatively, create a new commit from local changes in a work tree
2542 bcbc2272 2020-05-20 stsp directory with a log message that has been prepared in the file
2543 1795b260 2021-04-02 kn .Pa /tmp/msg :
2545 28cf319f 2021-01-28 stsp .Dl $ got commit -F /tmp/msg
2547 95fc3404 2019-07-15 stsp Update any work tree checked out from the
2548 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
2549 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
2551 95fc3404 2019-07-15 stsp .Dl $ got update
2553 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
2554 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
2555 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
2557 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
2558 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
2559 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
2560 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
2562 a099809f 2021-08-27 stsp Fetch new changes on the remote repository's
2563 a099809f 2021-08-27 stsp .Dq master
2564 a099809f 2021-08-27 stsp branch, making them visible on the local repository's
2565 469dd726 2020-03-20 stsp .Dq origin/master
2568 469dd726 2020-03-20 stsp .Dl $ cd /usr/src
2569 469dd726 2020-03-20 stsp .Dl $ got fetch
2571 469dd726 2020-03-20 stsp In a repository created with a HTTP URL and
2572 469dd726 2020-03-20 stsp .Cm git clone --bare
2574 469dd726 2020-03-20 stsp .Xr git-fetch 1
2575 469dd726 2020-03-20 stsp command must be used instead:
2577 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
2578 469dd726 2020-03-20 stsp .Dl $ git fetch origin master:refs/remotes/origin/master
2580 469dd726 2020-03-20 stsp Rebase the local
2581 469dd726 2020-03-20 stsp .Dq master
2582 469dd726 2020-03-20 stsp branch to merge the new changes that are now visible on the
2583 469dd726 2020-03-20 stsp .Dq origin/master
2586 469dd726 2020-03-20 stsp .Dl $ cd /usr/src
2587 469dd726 2020-03-20 stsp .Dl $ got update -b origin/master
2588 469dd726 2020-03-20 stsp .Dl $ got rebase master
2590 fa6e0e48 2019-05-23 stsp Rebase the
2591 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
2592 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
2593 fa6e0e48 2019-05-23 stsp .Dq master
2596 818c7501 2019-07-11 stsp .Dl $ got update -b master
2597 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
2599 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
2600 1dd86744 2019-08-12 anthony The patch can be mailed out for review and applied to
2601 1dd86744 2019-08-12 anthony .Ox Ns 's
2602 1dd86744 2019-08-12 anthony CVS tree:
2604 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
2606 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
2607 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
2610 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
2611 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
2612 0ebf8283 2019-07-24 stsp .Dl $ got histedit
2614 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
2615 469dd726 2020-03-20 stsp .Cm git clone --bare
2616 7848a0e1 2020-03-19 stsp instead of
2617 7848a0e1 2020-03-19 stsp .Cm got clone ,
2619 ff2cf171 2019-07-28 stsp .Dq refspec
2620 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
2622 ff2cf171 2019-07-28 stsp .Dq refs/remotes
2623 ff2cf171 2019-07-28 stsp namespace of the local repository.
2624 1795b260 2021-04-02 kn This can be achieved by setting Git's
2625 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
2626 ff2cf171 2019-07-28 stsp configuration variable to the value
2627 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
2629 ff2cf171 2019-07-28 stsp .Cm git config
2632 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2633 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
2635 469dd726 2020-03-20 stsp Additionally, the
2636 469dd726 2020-03-20 stsp .Dq mirror
2637 469dd726 2020-03-20 stsp option must be disabled:
2639 469dd726 2020-03-20 stsp .Dl $ cd /var/git/repo
2640 469dd726 2020-03-20 stsp .Dl $ git config remote.origin.mirror false
2642 ff2cf171 2019-07-28 stsp Alternatively, the following
2643 469dd726 2020-03-20 stsp .Xr git-fetch 1
2644 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
2645 ff2cf171 2019-07-28 stsp .Pa config
2648 91c82228 2021-04-18 stsp .Dl [remote \&"origin\&"]
2649 ff2cf171 2019-07-28 stsp .Dl url = ...
2650 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
2651 469dd726 2020-03-20 stsp .Dl mirror = false
2653 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
2654 ff2cf171 2019-07-28 stsp .Dq refs/heads
2655 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
2656 ff2cf171 2019-07-28 stsp .Cm got checkout
2657 ff2cf171 2019-07-28 stsp and, if needed, created with
2658 ff2cf171 2019-07-28 stsp .Cm got branch .
2659 ff2cf171 2019-07-28 stsp Branches in the
2660 a099809f 2021-08-27 stsp .Dq refs/remotes/origin
2661 469dd726 2020-03-20 stsp namespace can now be updated with incoming changes from the remote
2662 ff2cf171 2019-07-28 stsp repository with
2663 469dd726 2020-03-20 stsp .Cm got fetch
2665 469dd726 2020-03-20 stsp .Xr git-fetch 1
2666 a099809f 2021-08-27 stsp without extra command line arguments.
2667 a099809f 2021-08-27 stsp Newly fetched changes can be examined with
2668 a099809f 2021-08-27 stsp .Cm got log .
2670 a099809f 2021-08-27 stsp Display changes on the remote repository's version of the
2671 ff2cf171 2019-07-28 stsp .Dq master
2672 a099809f 2021-08-27 stsp branch, as of the last time
2673 a099809f 2021-08-27 stsp .Cm got fetch
2676 a099809f 2021-08-27 stsp .Dl $ got log -c origin/master | less
2678 a099809f 2021-08-27 stsp As shown here, most commands accept abbreviated reference names such as
2679 ff2cf171 2019-07-28 stsp .Dq origin/master
2680 a099809f 2021-08-27 stsp instead of
2681 a099809f 2021-08-27 stsp .Dq refs/remotes/origin/master .
2682 a099809f 2021-08-27 stsp The latter is only needed in case of ambiguity.
2684 a099809f 2021-08-27 stsp .Cm got rebase
2685 a099809f 2021-08-27 stsp must be used to merge changes which are visible on the
2686 a099809f 2021-08-27 stsp .Dq origin/master
2687 a099809f 2021-08-27 stsp branch into the
2688 a099809f 2021-08-27 stsp .Dq master
2690 7b0db533 2020-02-04 stsp This will also merge local changes, if any, with the incoming changes:
2692 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
2693 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
2695 a099809f 2021-08-27 stsp In order to make changes committed to the
2696 a099809f 2021-08-27 stsp .Dq unified-buffer-cache
2697 a099809f 2021-08-27 stsp visible on the
2698 a099809f 2021-08-27 stsp .Dq master
2699 a099809f 2021-08-27 stsp branch, the
2700 a099809f 2021-08-27 stsp .Dq unified-buffer-cache
2701 a099809f 2021-08-27 stsp branch must first be rebased onto the
2702 a099809f 2021-08-27 stsp .Dq master
2705 a099809f 2021-08-27 stsp .Dl $ got update -b master
2706 a099809f 2021-08-27 stsp .Dl $ got rebase unified-buffer-cache
2708 a099809f 2021-08-27 stsp Changes on the
2709 a099809f 2021-08-27 stsp .Dq unified-buffer-cache
2710 a099809f 2021-08-27 stsp branch can now be made visible on the
2711 a099809f 2021-08-27 stsp .Dq master
2712 a099809f 2021-08-27 stsp branch with
2713 a099809f 2021-08-27 stsp .Cm got integrate .
2714 a099809f 2021-08-27 stsp Because the rebase operation switched the work tree to the
2715 a099809f 2021-08-27 stsp .Dq unified-buffer-cache
2716 a099809f 2021-08-27 stsp branch the work tree must be switched back to the
2717 a099809f 2021-08-27 stsp .Dq master
2718 a099809f 2021-08-27 stsp branch first:
2720 a099809f 2021-08-27 stsp .Dl $ got update -b master
2721 a099809f 2021-08-27 stsp .Dl $ got integrate unified-buffer-cache
2724 083957f4 2020-02-24 stsp .Dq master
2725 083957f4 2020-02-24 stsp branch, log messages for local changes can now be amended with
2727 083957f4 2020-02-24 stsp by other developers and any other important new information:
2729 083957f4 2020-02-24 stsp .Dl $ got update -c origin/master
2730 083957f4 2020-02-24 stsp .Dl $ got histedit -m
2732 a099809f 2021-08-27 stsp If the remote repository offers write access local changes on the
2733 ff2cf171 2019-07-28 stsp .Dq master
2734 a099809f 2021-08-27 stsp branch can be sent to the remote repository with
2735 a099809f 2021-08-27 stsp .Cm got send.
2737 a099809f 2021-08-27 stsp .Cm got send
2738 a099809f 2021-08-27 stsp can be run without further arguments.
2739 a099809f 2021-08-27 stsp The arguments shown here match defaults, provided the work tree's
2740 a099809f 2021-08-27 stsp current branch is the
2741 a099809f 2021-08-27 stsp .Dq master
2744 a099809f 2021-08-27 stsp .Dl $ got send -b master origin
2746 a099809f 2021-08-27 stsp If the remote repository requires the HTTPS protocol the
2747 a099809f 2021-08-27 stsp .Xr git-push 1
2748 a099809f 2021-08-27 stsp command must be used instead:
2750 a099809f 2021-08-27 stsp .Dl $ cd /var/git/src.git
2751 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
2752 5c860e29 2018-03-12 stsp .Sh SEE ALSO
2753 0a79feb1 2021-04-10 stsp .Xr gotadmin 1 ,
2754 2312fc47 2019-07-15 stsp .Xr tog 1 ,
2755 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
2756 257add31 2020-09-09 stsp .Xr got-worktree 5 ,
2757 257add31 2020-09-09 stsp .Xr got.conf 5
2758 1a208aaf 2018-04-01 stsp .Sh AUTHORS
2759 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
2760 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
2761 bc3056e3 2019-08-18 stsp .An Joshua Stein Aq Mt jcs@openbsd.org
2762 83b416ed 2020-03-18 stsp .An Ori Bernstein Aq Mt ori@openbsd.org
2763 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
2765 cc63216e 2020-12-26 stsp is a work-in-progress and some features remain to be implemented.
2767 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
2769 cc63216e 2020-12-26 stsp to perform some tasks.
2770 cc63216e 2020-12-26 stsp In particular:
2771 cc63216e 2020-12-26 stsp .Bl -bullet
2773 cc63216e 2020-12-26 stsp Reading from remote repositories over HTTP or HTTPS protocols requires
2774 cc63216e 2020-12-26 stsp .Xr git-clone 1
2776 cc63216e 2020-12-26 stsp .Xr git-fetch 1 .
2778 a099809f 2021-08-27 stsp Writing to remote repositories over HTTP or HTTPS protocols requires
2779 cc63216e 2020-12-26 stsp .Xr git-push 1 .
2781 cc63216e 2020-12-26 stsp The creation of merge commits, i.e. commits with two or more parent commits,
2783 cc63216e 2020-12-26 stsp .Xr git-merge 1 .
2785 cc63216e 2020-12-26 stsp In situations where files or directories were moved around
2787 cc63216e 2020-12-26 stsp will not automatically merge changes to new locations and
2789 cc63216e 2020-12-26 stsp will usually produce better results.
