2 5c860e29 2018-03-12 stsp .\" Copyright (c) 2017 Martin Pieuchot
3 5aa81393 2020-01-06 stsp .\" Copyright (c) 2018, 2019, 2020 Stefan Sperling
5 5c860e29 2018-03-12 stsp .\" Permission to use, copy, modify, and distribute this software for any
6 5c860e29 2018-03-12 stsp .\" purpose with or without fee is hereby granted, provided that the above
7 5c860e29 2018-03-12 stsp .\" copyright notice and this permission notice appear in all copies.
9 5c860e29 2018-03-12 stsp .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 5c860e29 2018-03-12 stsp .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 5c860e29 2018-03-12 stsp .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 5c860e29 2018-03-12 stsp .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 5c860e29 2018-03-12 stsp .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 5c860e29 2018-03-12 stsp .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 5c860e29 2018-03-12 stsp .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 5c860e29 2018-03-12 stsp .Dd $Mdocdate$
22 8e13c46f 2019-08-05 stsp .Nd Game of Trees
23 5c860e29 2018-03-12 stsp .Sh SYNOPSIS
27 5c860e29 2018-03-12 stsp .Op Ar arg ...
28 5c860e29 2018-03-12 stsp .Sh DESCRIPTION
30 4dfb2f0f 2019-03-26 stsp is a version control system which stores the history of tracked files
31 4dfb2f0f 2019-03-26 stsp in a Git repository, as used by the Git version control system.
32 285dc8a4 2018-03-13 stsp This repository format is described in
33 5e5560e1 2018-08-01 stsp .Xr git-repository 5 .
37 ae73e26f 2019-03-26 stsp .Dq distributed
38 4129c201 2018-03-13 stsp version control system because every copy of a repository is writeable.
39 4129c201 2018-03-13 stsp Modifications made to files can be synchronized between repositories
40 97925469 2018-03-17 stsp at any time.
42 285dc8a4 2018-03-13 stsp Files managed by
44 4129c201 2018-03-13 stsp must be checked out from the repository for modification.
45 285dc8a4 2018-03-13 stsp Checked out files are stored in a
46 285dc8a4 2018-03-13 stsp .Em work tree
47 c5867b47 2018-03-13 stsp which can be placed at an arbitrary directory in the filesystem hierarchy.
48 fb2921d0 2019-03-26 stsp The on-disk format of this work tree is described in
49 285dc8a4 2018-03-13 stsp .Xr got-worktree 5 .
52 285dc8a4 2018-03-13 stsp provides global and command-specific options.
53 bc3056e3 2019-08-18 stsp Global options must precede the command name, and are as follows:
54 1b6b95a8 2018-03-12 stsp .Bl -tag -width tenletters
56 fef8a0d3 2019-08-04 stsp Display usage information and exit immediately.
57 83cd27f8 2020-01-13 stsp .It Fl V, -version
58 53ccebc2 2019-07-30 stsp Display program version and exit immediately.
61 38e11793 2018-06-13 stsp The commands for
63 38e11793 2018-06-13 stsp are as follows:
64 0bb8a95e 2018-03-12 stsp .Bl -tag -width checkout
65 09ea71ba 2019-07-27 stsp .It Cm init Ar repository-path
66 2c7829a4 2019-06-17 stsp Create a new empty repository at the specified
67 09ea71ba 2019-07-27 stsp .Ar repository-path .
70 3ce1b845 2019-07-15 stsp .Cm got init ,
72 3ce1b845 2019-07-15 stsp .Cm got import
73 3ce1b845 2019-07-15 stsp command must be used to populate the empty repository before
74 3ce1b845 2019-07-15 stsp .Cm got checkout
75 3ce1b845 2019-07-15 stsp can be used.
77 bc26cce8 2019-08-04 stsp Short alias for
79 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
80 3ce1b845 2019-07-15 stsp Create an initial commit in a repository from the file hierarchy
81 3ce1b845 2019-07-15 stsp within the specified
82 3ce1b845 2019-07-15 stsp .Ar directory .
83 3ce1b845 2019-07-15 stsp The created commit will not have any parent commits, i.e. it will be a
84 3ce1b845 2019-07-15 stsp root commit.
85 3ce1b845 2019-07-15 stsp Also create a new reference which provides a branch name for the newly
86 3ce1b845 2019-07-15 stsp created commit.
87 21a44f98 2019-07-15 stsp Show the path of each imported file to indicate progress.
90 21a44f98 2019-07-15 stsp .Cm got import
91 21a44f98 2019-07-15 stsp command requires the
92 21a44f98 2019-07-15 stsp .Ev GOT_AUTHOR
93 aba9c984 2019-09-08 stsp environment variable to be set,
94 aba9c984 2019-09-08 stsp unless Git's
95 aba9c984 2019-09-08 stsp .Dv user.name
97 709ae9eb 2019-09-08 stsp .Dv user.email
98 709ae9eb 2019-09-08 stsp configuration settings can be obtained from the repository's
99 aba9c984 2019-09-08 stsp .Pa .git/config
100 c9956ddf 2019-09-08 stsp file or from Git's global
101 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
102 c9956ddf 2019-09-08 stsp configuration file.
104 3ce1b845 2019-07-15 stsp The options for
105 3ce1b845 2019-07-15 stsp .Cm got import
106 3ce1b845 2019-07-15 stsp are as follows:
107 3ce1b845 2019-07-15 stsp .Bl -tag -width Ds
108 3ce1b845 2019-07-15 stsp .It Fl b Ar branch
109 3ce1b845 2019-07-15 stsp Create the specified
111 3ce1b845 2019-07-15 stsp instead of creating the default branch
113 3ce1b845 2019-07-15 stsp Use of this option is required if the
115 3ce1b845 2019-07-15 stsp branch already exists.
116 3ce1b845 2019-07-15 stsp .It Fl m Ar message
117 3ce1b845 2019-07-15 stsp Use the specified log message when creating the new commit.
118 3ce1b845 2019-07-15 stsp Without the
121 3ce1b845 2019-07-15 stsp .Cm got import
122 3ce1b845 2019-07-15 stsp opens a temporary file in an editor where a log message can be written.
123 3ce1b845 2019-07-15 stsp .It Fl r Ar repository-path
124 3ce1b845 2019-07-15 stsp Use the repository at the specified path.
125 3ce1b845 2019-07-15 stsp If not specified, assume the repository is located at or above the current
126 3ce1b845 2019-07-15 stsp working directory.
127 3ce1b845 2019-07-15 stsp .It Fl I Ar pattern
128 3ce1b845 2019-07-15 stsp Ignore files or directories with a name which matches the specified
129 3ce1b845 2019-07-15 stsp .Ar pattern .
130 3ce1b845 2019-07-15 stsp This option may be specified multiple times to build a list of ignore patterns.
132 3ce1b845 2019-07-15 stsp .Ar pattern
133 3ce1b845 2019-07-15 stsp follows the globbing rules documented in
134 3ce1b845 2019-07-15 stsp .Xr glob 7 .
137 bc26cce8 2019-08-04 stsp Short alias for
138 bc26cce8 2019-08-04 stsp .Cm import .
139 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
140 2ab43947 2020-03-18 stsp Clone a Git repository at the specified
141 2ab43947 2020-03-18 stsp .Ar repository-URL
142 2ab43947 2020-03-18 stsp into the specified
143 3493b628 2020-03-20 stsp .Ar directory .
145 3493b628 2020-03-20 stsp .Ar directory
146 2ab43947 2020-03-18 stsp is specified the directory name will be derived from the name of the
147 2ab43947 2020-03-18 stsp cloned repository.
148 2ab43947 2020-03-18 stsp .Cm got clone
149 2ab43947 2020-03-18 stsp will refuse to run if the
150 3493b628 2020-03-20 stsp .Ar directory
151 2ab43947 2020-03-18 stsp already exists.
154 2ab43947 2020-03-18 stsp .Ar repository-URL
155 619eb6dd 2020-03-20 stsp specifies a protocol scheme, a server hostname, an optional port number
156 619eb6dd 2020-03-20 stsp separated from the hostname by a colon, and a path to the repository on
157 619eb6dd 2020-03-20 stsp the server:
158 619eb6dd 2020-03-20 stsp .Lk scheme://hostname:port/path/to/repository
160 2ab43947 2020-03-18 stsp The following protocol schemes are supported:
161 2ab43947 2020-03-18 stsp .Bl -tag -width git+ssh
163 2ab43947 2020-03-18 stsp The Git protocol as implemented by the
164 2ab43947 2020-03-18 stsp .Xr git-daemon 1
166 10c073e7 2020-03-20 stsp Use of this protocol is discouraged since it supports neither authentication
167 10c073e7 2020-03-20 stsp nor encryption.
168 2ab43947 2020-03-18 stsp .It git+ssh
169 2ab43947 2020-03-18 stsp The Git protocol wrapped in an authenticated and encrypted
172 2ab43947 2020-03-18 stsp With this protocol the hostname may contain an embedded username for
175 2ab43947 2020-03-18 stsp .Mt user@hostname
177 2ab43947 2020-03-18 stsp Short alias for git+ssh.
180 89c3c67b 2020-03-20 stsp Objects in the cloned repository are stored in a pack file which is downloaded
181 89c3c67b 2020-03-20 stsp from the server.
182 89c3c67b 2020-03-20 stsp This pack file will then be indexed to facilitate access to the objects stored
184 89c3c67b 2020-03-20 stsp If any objects in the pack file are stored in deltified form, all deltas will
185 89c3c67b 2020-03-20 stsp be fully resolved in order to compute the ID of such objects.
186 89c3c67b 2020-03-20 stsp This can take some time.
187 010f7279 2020-03-20 stsp More details about the pack file format are documented in
188 010f7279 2020-03-20 stsp .Xr git-repository 5 .
190 7848a0e1 2020-03-19 stsp .Cm got clone
191 7848a0e1 2020-03-19 stsp creates a remote repository entry in the
193 7848a0e1 2020-03-19 stsp file of the cloned repository to store the
194 7848a0e1 2020-03-19 stsp .Ar repository-url
195 7848a0e1 2020-03-19 stsp for future use by
196 7848a0e1 2020-03-19 stsp .Cm got fetch
198 7848a0e1 2020-03-19 stsp .Xr git-fetch 1 .
200 2ab43947 2020-03-18 stsp The options for
201 2ab43947 2020-03-18 stsp .Cm got clone
202 2ab43947 2020-03-18 stsp are as follows:
203 2ab43947 2020-03-18 stsp .Bl -tag -width Ds
205 1d4b192f 2020-03-21 stsp Fetch all branches from the remote repository's
206 1d4b192f 2020-03-21 stsp .Dq refs/heads/
207 1d4b192f 2020-03-21 stsp reference namespace.
208 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
209 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
210 4ba14133 2020-03-20 stsp Cannot be used together with the
213 4ba14133 2020-03-20 stsp .It Fl b Ar branch
214 4ba14133 2020-03-20 stsp Fetch the specified
216 1d4b192f 2020-03-21 stsp from the remote repository's
217 1d4b192f 2020-03-21 stsp .Dq refs/heads/
218 1d4b192f 2020-03-21 stsp reference namespace.
219 4ba14133 2020-03-20 stsp This option may be specified multiple times to build a list of branches
221 4ba14133 2020-03-20 stsp If the branch corresponding to the remote repository's HEAD reference is not
222 4ba14133 2020-03-20 stsp in this list, the cloned repository's HEAD reference will be set to the first
223 4ba14133 2020-03-20 stsp branch which was fetched.
224 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
225 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
226 4ba14133 2020-03-20 stsp Cannot be used together with the
230 a18cccf9 2020-03-21 stsp List branches and tags available for fetching from the remote repository
231 41b0de12 2020-03-21 stsp and exit immediately.
232 41b0de12 2020-03-21 stsp Cannot be used together with any of the other options except
235 469dd726 2020-03-20 stsp Create the cloned repository as a mirror of the original repository.
236 469dd726 2020-03-20 stsp This is useful if the cloned repository will not be used to store
237 bd81cfb7 2020-04-19 stsp locally created commits.
239 469dd726 2020-03-20 stsp The repository's
241 469dd726 2020-03-20 stsp file will be set up with the
243 469dd726 2020-03-20 stsp option enabled, such that
244 469dd726 2020-03-20 stsp .Cm got fetch
246 469dd726 2020-03-20 stsp .Xr git-fetch 1
247 bd81cfb7 2020-04-19 stsp will write incoming changes directly to branches in the
248 469dd726 2020-03-20 stsp .Dq refs/heads/
249 469dd726 2020-03-20 stsp reference namespace, rather than to branches in the
250 469dd726 2020-03-20 stsp .Dq refs/remotes/
252 469dd726 2020-03-20 stsp This avoids the usual requirement of having to run
253 469dd726 2020-03-20 stsp .Cm got rebase
255 469dd726 2020-03-20 stsp .Cm got fetch
256 bd81cfb7 2020-04-19 stsp in order to make incoming changes appear on branches in the
257 bd81cfb7 2020-04-19 stsp .Dq refs/heads/
259 bd81cfb7 2020-04-19 stsp But maintaining custom changes in the cloned repository becomes difficult
260 bd81cfb7 2020-04-19 stsp since such changes will be at risk of being discarded whenever incoming
261 498ef124 2020-03-21 stsp changes are fetched.
263 2ab43947 2020-03-18 stsp Suppress progress reporting output.
264 2ab43947 2020-03-18 stsp The same option will be passed to
266 2ab43947 2020-03-18 stsp if applicable.
268 2690194b 2020-03-21 stsp Verbose mode.
270 2690194b 2020-03-21 stsp .Cm got clone
271 2690194b 2020-03-21 stsp to print debugging messages to standard error output.
272 2690194b 2020-03-21 stsp This option will be passed to
274 2ab43947 2020-03-18 stsp if applicable.
275 2ab43947 2020-03-18 stsp Multiple -v options increase the verbosity.
276 2ab43947 2020-03-18 stsp The maximum is 3.
277 0e4002ca 2020-03-21 stsp .It Fl R Ar reference
278 0e4002ca 2020-03-21 stsp In addition to the branches and tags that will be fetched, fetch an arbitrary
279 0e4002ca 2020-03-21 stsp .Ar reference
280 0e4002ca 2020-03-21 stsp from the remote repository's
283 0e4002ca 2020-03-21 stsp This option may be specified multiple times to build a list of additional
284 0e4002ca 2020-03-21 stsp references to fetch.
285 71f12362 2020-03-21 stsp The specified
286 71f12362 2020-03-21 stsp .Ar reference
287 a18cccf9 2020-03-21 stsp may either be a path to a specific reference, or a reference namespace
288 71f12362 2020-03-21 stsp which will cause all references in this namespace to be fetched.
290 71f12362 2020-03-21 stsp Each reference will be mapped into the cloned repository's
291 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
292 0e4002ca 2020-03-21 stsp namespace, unless the
294 0e4002ca 2020-03-21 stsp option is used to mirror references directly into the cloned repository's
298 0e4002ca 2020-03-21 stsp .Cm got clone
299 0e4002ca 2020-03-21 stsp will refuse to fetch references from the remote repository's
300 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
302 0e4002ca 2020-03-21 stsp .Dq refs/got/
306 267fe567 2020-03-18 stsp Short alias for
307 267fe567 2020-03-18 stsp .Cm clone .
308 4d482d9d 2020-03-21 stsp .It Cm fetch Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl d Oc Oo Fl l Oc Oo Fl r Ar repository-path Oc Oo Fl t Oc Oo Fl q Oc Oo Fl v Oc Oo Fl R Ar reference Oc Op Ar remote-repository
309 7848a0e1 2020-03-19 stsp Fetch new changes from a remote repository.
311 4ba14133 2020-03-20 stsp .Ar remote-repository
312 4ba14133 2020-03-20 stsp is specified,
314 7848a0e1 2020-03-19 stsp will be used.
315 7848a0e1 2020-03-19 stsp The remote repository's URL is obtained from the corresponding entry in the
317 f8ab0c60 2020-03-20 stsp file of the local repository, as created by
318 7848a0e1 2020-03-19 stsp .Cm got clone .
320 89c3c67b 2020-03-20 stsp New changes will be stored in a separate pack file downloaded from the server.
321 89c3c67b 2020-03-20 stsp Optionally, separate pack files stored in the repository can be combined with
322 89c3c67b 2020-03-20 stsp .Xr git-repack 1 .
324 498ef124 2020-03-21 stsp By default, branch references in the
325 7848a0e1 2020-03-19 stsp .Dq refs/remotes/
326 498ef124 2020-03-21 stsp reference namespace will be updated to point at the newly fetched commits.
328 498ef124 2020-03-21 stsp .Cm got rebase
329 bd81cfb7 2020-04-19 stsp command can then be used to make new changes visible on branches in the
330 7848a0e1 2020-03-19 stsp .Dq refs/heads/
331 bd81cfb7 2020-04-19 stsp namespace, merging incoming changes with the changes on those branches
332 bd81cfb7 2020-04-19 stsp as necessary.
334 498ef124 2020-03-21 stsp If the repository was created as a mirror with
335 498ef124 2020-03-21 stsp .Cm got clone -m
336 498ef124 2020-03-21 stsp then all branches in the
337 469dd726 2020-03-20 stsp .Dq refs/heads/
338 498ef124 2020-03-21 stsp namespace will be updated directly to match the corresponding branches in
339 498ef124 2020-03-21 stsp the remote repository.
340 175367bd 2020-03-20 stsp If those branches contained local commits, these commits will no longer be
341 175367bd 2020-03-20 stsp reachable via a reference and will therefore be at risk of being discarded
342 175367bd 2020-03-20 stsp by Git's garbage collector.
343 bd81cfb7 2020-04-19 stsp Maintaining custom changes in a mirror repository is therefore discouraged.
345 db6d8ad8 2020-03-21 stsp In any case, references in the
346 7848a0e1 2020-03-19 stsp .Dq refs/tags/
347 db6d8ad8 2020-03-21 stsp namespace will always be fetched and mapped directly to local references
348 db6d8ad8 2020-03-21 stsp in the same namespace.
350 7848a0e1 2020-03-19 stsp The options for
351 7848a0e1 2020-03-19 stsp .Cm got fetch
352 7848a0e1 2020-03-19 stsp are as follows:
353 7848a0e1 2020-03-19 stsp .Bl -tag -width Ds
355 1d4b192f 2020-03-21 stsp Fetch all branches from the remote repository's
356 1d4b192f 2020-03-21 stsp .Dq refs/heads/
357 1d4b192f 2020-03-21 stsp reference namespace.
358 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
359 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
360 4ba14133 2020-03-20 stsp Cannot be used together with the
363 4ba14133 2020-03-20 stsp .It Fl b Ar branch
364 4ba14133 2020-03-20 stsp Fetch the specified
366 1d4b192f 2020-03-21 stsp from the remote repository's
367 1d4b192f 2020-03-21 stsp .Dq refs/heads/
368 1d4b192f 2020-03-21 stsp reference namespace.
369 4ba14133 2020-03-20 stsp This option may be specified multiple times to build a list of branches
371 4ba14133 2020-03-20 stsp If this option is not specified, a branch resolved via the remote
372 4ba14133 2020-03-20 stsp repository's HEAD reference will be fetched.
373 4ba14133 2020-03-20 stsp Cannot be used together with the
377 f21ec2f0 2020-03-21 stsp Delete branches and tags from the local repository which are no longer
378 f21ec2f0 2020-03-21 stsp present in the remote repository.
379 f21ec2f0 2020-03-21 stsp Only references are deleted.
380 239821eb 2020-03-21 stsp Any commit, tree, tag, and blob objects belonging to deleted branches or
381 f21ec2f0 2020-03-21 stsp tags remain in the repository and may be removed separately with
382 f21ec2f0 2020-03-21 stsp Git's garbage collector.
384 41b0de12 2020-03-21 stsp List branches and tags available for fetching from the remote repository
385 41b0de12 2020-03-21 stsp and exit immediately.
386 41b0de12 2020-03-21 stsp Cannot be used together with any of the other options except
391 db6d8ad8 2020-03-21 stsp Allow existing references in the
392 db6d8ad8 2020-03-21 stsp .Dq refs/tags
393 db6d8ad8 2020-03-21 stsp namespace to be updated if they have changed on the server.
394 db6d8ad8 2020-03-21 stsp If not specified, only new tag references will be created.
395 7848a0e1 2020-03-19 stsp .It Fl r Ar repository-path
396 7848a0e1 2020-03-19 stsp Use the repository at the specified path.
397 7848a0e1 2020-03-19 stsp If not specified, assume the repository is located at or above the current
398 7848a0e1 2020-03-19 stsp working directory.
399 7848a0e1 2020-03-19 stsp If this directory is a
401 7848a0e1 2020-03-19 stsp work tree, use the repository path associated with this work tree.
403 7848a0e1 2020-03-19 stsp Suppress progress reporting output.
404 7848a0e1 2020-03-19 stsp The same option will be passed to
406 7848a0e1 2020-03-19 stsp if applicable.
408 2690194b 2020-03-21 stsp Verbose mode.
410 2690194b 2020-03-21 stsp .Cm got fetch
411 2690194b 2020-03-21 stsp to print debugging messages to standard error output.
412 7848a0e1 2020-03-19 stsp The same option will be passed to
414 7848a0e1 2020-03-19 stsp if applicable.
415 7848a0e1 2020-03-19 stsp Multiple -v options increase the verbosity.
416 7848a0e1 2020-03-19 stsp The maximum is 3.
417 0e4002ca 2020-03-21 stsp .It Fl R Ar reference
418 0e4002ca 2020-03-21 stsp In addition to the branches and tags that will be fetched, fetch an arbitrary
419 0e4002ca 2020-03-21 stsp .Ar reference
420 0e4002ca 2020-03-21 stsp from the remote repository's
423 0e4002ca 2020-03-21 stsp This option may be specified multiple times to build a list of additional
424 0e4002ca 2020-03-21 stsp references to fetch.
425 71f12362 2020-03-21 stsp The specified
426 71f12362 2020-03-21 stsp .Ar reference
427 a18cccf9 2020-03-21 stsp may either be a path to a specific reference, or a reference namespace
428 71f12362 2020-03-21 stsp which will cause all references in this namespace to be fetched.
430 0e4002ca 2020-03-21 stsp Each reference will be mapped into the local repository's
431 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
432 0e4002ca 2020-03-21 stsp namespace, unless the local repository was created as a mirror with
433 a18cccf9 2020-03-21 stsp .Cm got clone -m
434 a18cccf9 2020-03-21 stsp in which case references will be mapped directly into the local repository's
438 bd81cfb7 2020-04-19 stsp Once a reference has been fetched, a branch based on it can be created with
439 0e4002ca 2020-03-21 stsp .Cm got branch
442 0e4002ca 2020-03-21 stsp .Cm got fetch
443 0e4002ca 2020-03-21 stsp will refuse to fetch references from the remote repository's
444 0e4002ca 2020-03-21 stsp .Dq refs/remotes/
446 0e4002ca 2020-03-21 stsp .Dq refs/got/
450 7848a0e1 2020-03-19 stsp Short alias for
451 7848a0e1 2020-03-19 stsp .Cm fetch .
452 74daf7cb 2020-01-27 stsp .It Cm checkout Oo Fl E Oc Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Oo Fl p Ar path-prefix Oc Ar repository-path Op Ar work-tree-path
453 0bb8a95e 2018-03-12 stsp Copy files from a repository into a new work tree.
454 bb51a5b4 2020-01-13 stsp Show the status of each affected file, using the following status codes:
455 bb51a5b4 2020-01-13 stsp .Bl -column YXZ description
456 bb51a5b4 2020-01-13 stsp .It A Ta new file was added
457 bb51a5b4 2020-01-13 stsp .It E Ta file already exists in work tree's meta-data
461 5d7c1dab 2018-04-01 stsp .Ar work tree path
462 c844a238 2019-02-06 stsp is not specified, either use the last component of
463 5d7c1dab 2018-04-01 stsp .Ar repository path ,
465 5d7c1dab 2018-04-01 stsp .Ar path prefix
466 c844a238 2019-02-06 stsp was specified use the last component of
467 5d7c1dab 2018-04-01 stsp .Ar path prefix .
469 38e11793 2018-06-13 stsp The options for
470 38e11793 2018-06-13 stsp .Cm got checkout
471 38e11793 2018-06-13 stsp are as follows:
472 38e11793 2018-06-13 stsp .Bl -tag -width Ds
474 bb51a5b4 2020-01-13 stsp Proceed with the checkout operation even if the directory at
475 bb51a5b4 2020-01-13 stsp .Ar work-tree-path
476 bb51a5b4 2020-01-13 stsp is not empty.
477 bb51a5b4 2020-01-13 stsp Existing files will be left intact.
478 08573d5b 2019-05-14 stsp .It Fl b Ar branch
479 3c575567 2019-07-28 stsp Check out files from a commit on the specified
480 08573d5b 2019-05-14 stsp .Ar branch .
481 08573d5b 2019-05-14 stsp If this option is not specified, a branch resolved via the repository's HEAD
482 08573d5b 2019-05-14 stsp reference will be used.
483 8069f636 2019-01-12 stsp .It Fl c Ar commit
484 8069f636 2019-01-12 stsp Check out files from the specified
486 3c575567 2019-07-28 stsp on the selected branch.
487 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
488 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
489 0e1b0230 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
490 0e1b0230 2019-07-07 stsp automatically, provided the abbreviation is unique.
491 08573d5b 2019-05-14 stsp If this option is not specified, the most recent commit on the selected
492 08573d5b 2019-05-14 stsp branch will be used.
494 4b6c9460 2020-03-05 stsp If the specified
496 4b6c9460 2020-03-05 stsp is not contained in the selected branch, a different branch which contains
497 4b6c9460 2020-03-05 stsp this commit must be specified with the
500 4b6c9460 2020-03-05 stsp If no such branch is known a new branch must be created for this
501 4b6c9460 2020-03-05 stsp commit with
502 4b6c9460 2020-03-05 stsp .Cm got branch
504 4b6c9460 2020-03-05 stsp .Cm got checkout
505 4b6c9460 2020-03-05 stsp can be used.
506 4b6c9460 2020-03-05 stsp Checking out work trees with an unknown branch is intentionally not supported.
507 38e11793 2018-06-13 stsp .It Fl p Ar path-prefix
508 38e11793 2018-06-13 stsp Restrict the work tree to a subset of the repository's tree hierarchy.
509 38e11793 2018-06-13 stsp Only files beneath the specified
510 38e11793 2018-06-13 stsp .Ar path-prefix
511 38e11793 2018-06-13 stsp will be checked out.
514 97b3a7be 2019-07-09 stsp Short alias for
515 97b3a7be 2019-07-09 stsp .Cm checkout .
516 dfc23429 2019-08-11 stsp .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Op Ar path ...
517 4f331d3a 2020-04-01 stsp Update an existing work tree to a different
518 4f331d3a 2020-04-01 stsp .Ar commit .
519 4f331d3a 2020-04-01 stsp Change existing files in the work tree as necessary to match file contents
520 4f331d3a 2020-04-01 stsp of this commit.
521 4f331d3a 2020-04-01 stsp Preserve any local changes in the work tree and merge them with the
522 4f331d3a 2020-04-01 stsp incoming changes.
524 5036ab18 2020-04-18 stsp Files which already contain merge conflicts will not be updated to avoid
525 5036ab18 2020-04-18 stsp further complications.
526 5036ab18 2020-04-18 stsp Such files will be updated when
527 5036ab18 2020-04-18 stsp .Cm got update
528 5036ab18 2020-04-18 stsp is run again after merge conflicts have been resolved.
529 5036ab18 2020-04-18 stsp If the conflicting changes are no longer needed affected files can be
530 5036ab18 2020-04-18 stsp reverted with
531 5036ab18 2020-04-18 stsp .Cm got revert
532 5036ab18 2020-04-18 stsp before running
533 5036ab18 2020-04-18 stsp .Cm got update
536 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
537 7f838b36 2019-02-08 stsp .Bl -column YXZ description
538 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
539 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
540 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
541 7f838b36 2019-02-08 stsp .It D Ta file was deleted
542 7f838b36 2019-02-08 stsp .It A Ta new file was added
543 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
544 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
545 5036ab18 2020-04-18 stsp .It # Ta file was not updated because it contains merge conflicts
550 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
551 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
552 f2ea84fa 2019-07-27 stsp specified paths.
553 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
554 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
555 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
558 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
559 c4cdcb68 2019-04-03 stsp multiple base commits.
560 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
561 47ec7be7 2019-05-12 stsp .Cm got update
562 47ec7be7 2019-05-12 stsp across the entire work tree.
563 024e9686 2019-05-14 stsp Specifying a
565 024e9686 2019-05-14 stsp is incompatible with the
569 4ed9f614 2019-08-04 stsp .Cm got update
570 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
571 4ed9f614 2019-08-04 stsp If changes have been staged with
572 4ed9f614 2019-08-04 stsp .Cm got stage ,
573 bc3056e3 2019-08-18 stsp these changes must first be committed with
574 4ed9f614 2019-08-04 stsp .Cm got commit
575 4ed9f614 2019-08-04 stsp or unstaged with
576 4ed9f614 2019-08-04 stsp .Cm got unstage .
578 507dc3bb 2018-12-29 stsp The options for
579 507dc3bb 2018-12-29 stsp .Cm got update
580 507dc3bb 2018-12-29 stsp are as follows:
581 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
582 024e9686 2019-05-14 stsp .It Fl b Ar branch
583 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
585 024e9686 2019-05-14 stsp before updating the work tree.
586 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
588 4f331d3a 2020-04-01 stsp As usual, any local changes in the work tree will be preserved.
589 4f331d3a 2020-04-01 stsp This can be useful when switching to a newly created branch in order
590 4f331d3a 2020-04-01 stsp to commit existing local changes to this branch.
592 4f331d3a 2020-04-01 stsp Any local changes must be dealt with separately in order to obtain a
593 4f331d3a 2020-04-01 stsp work tree with pristine file contents corresponding exactly to the specified
594 4f331d3a 2020-04-01 stsp .Ar branch .
595 4f331d3a 2020-04-01 stsp Such changes could first be committed to a different branch with
596 4f331d3a 2020-04-01 stsp .Cm got commit ,
597 4f331d3a 2020-04-01 stsp or could be discarded with
598 4f331d3a 2020-04-01 stsp .Cm got revert .
599 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
600 507dc3bb 2018-12-29 stsp Update the work tree to the specified
601 507dc3bb 2018-12-29 stsp .Ar commit .
602 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
603 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
604 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
605 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
606 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
607 024e9686 2019-05-14 stsp branch will be used.
610 97b3a7be 2019-07-09 stsp Short alias for
611 97b3a7be 2019-07-09 stsp .Cm update .
612 dfc23429 2019-08-11 stsp .It Cm status Op Ar path ...
613 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
614 6bad629b 2019-02-04 stsp using the following status codes:
615 6bad629b 2019-02-04 stsp .Bl -column YXZ description
616 6bad629b 2019-02-04 stsp .It M Ta modified file
617 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
618 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
619 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
620 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
621 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
622 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
624 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
625 2a06fe5f 2019-08-24 stsp .It N Ta non-existent
627 2a06fe5f 2019-08-24 stsp specified on the command line
632 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
633 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
635 4ed9f614 2019-08-04 stsp If changes have been staged with
636 4ed9f614 2019-08-04 stsp .Cm got stage ,
637 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
638 4ed9f614 2019-08-04 stsp status codes:
639 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
640 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
641 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
642 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
645 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
646 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
647 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
648 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
651 6841da00 2019-08-08 stsp For compatibility with
654 bd8de430 2019-10-04 stsp .Xr git 1 ,
655 6841da00 2019-08-08 stsp .Cm got status
658 bd8de430 2019-10-04 stsp patterns from
659 6841da00 2019-08-08 stsp .Pa .cvsignore
661 bd8de430 2019-10-04 stsp .Pa .gitignore
662 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
663 bd8de430 2019-10-04 stsp which match these patterns.
664 bd8de430 2019-10-04 stsp As an extension to
666 bd8de430 2019-10-04 stsp matching rules,
667 bd8de430 2019-10-04 stsp .Cm got status
668 bd8de430 2019-10-04 stsp supports consecutive asterisks,
670 bd8de430 2019-10-04 stsp which will match an arbitrary amount of directories.
672 6841da00 2019-08-08 stsp .Xr cvs 1 ,
673 6841da00 2019-08-08 stsp .Cm got status
674 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
676 bd8de430 2019-10-04 stsp .Xr git 1 ,
677 bd8de430 2019-10-04 stsp .Cm got status
678 bd8de430 2019-10-04 stsp does not support negated ignore patterns prefixed with
680 bd8de430 2019-10-04 stsp and gives no special significance to the location of path component separators,
682 bd8de430 2019-10-04 stsp in a pattern.
684 97b3a7be 2019-07-09 stsp Short alias for
685 97b3a7be 2019-07-09 stsp .Cm status .
686 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
687 38e11793 2018-06-13 stsp Display history of a repository.
690 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
691 dc990cbf 2020-02-22 stsp If invoked in a work tree, the
693 dc990cbf 2020-02-22 stsp is interpreted relative to the current working directory,
694 dc990cbf 2020-02-22 stsp and the work tree's path prefix is implicitly prepended.
695 dc990cbf 2020-02-22 stsp Otherwise, the path is interpreted relative to the repository root.
697 38e11793 2018-06-13 stsp The options for
698 38e11793 2018-06-13 stsp .Cm got log
699 38e11793 2018-06-13 stsp are as follows:
700 38e11793 2018-06-13 stsp .Bl -tag -width Ds
702 1137e0ae 2020-01-27 stsp Display individual commits which were merged into the current branch
703 1137e0ae 2020-01-27 stsp from other branches.
704 48c8c60d 2020-01-27 stsp By default,
705 48c8c60d 2020-01-27 stsp .Cm got log
706 48c8c60d 2020-01-27 stsp shows the linear history of the current branch only.
707 38e11793 2018-06-13 stsp .It Fl c Ar commit
708 38e11793 2018-06-13 stsp Start traversing history at the specified
709 38e11793 2018-06-13 stsp .Ar commit .
710 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
711 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
712 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
713 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
714 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
715 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
716 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
717 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
719 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
720 6238ee32 2018-06-13 stsp .It Fl l Ar N
721 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
722 b1ebc001 2019-08-13 stsp If this option is not specified, a default limit value of zero is used,
723 b1ebc001 2019-08-13 stsp which is treated as an unbounded limit.
725 b1ebc001 2019-08-13 stsp .Ev GOT_LOG_DEFAULT_LIMIT
726 b1ebc001 2019-08-13 stsp environment variable may be set to change this default value.
728 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
731 44392932 2019-08-25 stsp is specified, only show the patch of modifications at or within this path.
733 0208f208 2020-05-05 stsp Display the list of file paths changed in each commit, using the following
734 0208f208 2020-05-05 stsp status codes:
735 0208f208 2020-05-05 stsp .Bl -column YXZ description
736 0208f208 2020-05-05 stsp .It M Ta modified file
737 0208f208 2020-05-05 stsp .It D Ta file was deleted
738 0208f208 2020-05-05 stsp .It A Ta new file was added
739 0208f208 2020-05-05 stsp .It m Ta modified file modes (executable bit only)
741 c6390436 2019-11-29 kn .It Fl s Ar search-pattern
742 c6390436 2019-11-29 kn If specified, show only commits with a log message matched by the extended
743 6841bf13 2019-11-29 kn regular expression
744 6841bf13 2019-11-29 kn .Ar search-pattern .
745 0208f208 2020-05-05 stsp When used together with
747 0208f208 2020-05-05 stsp then the file paths changed by a commit can be matched as well.
748 6841bf13 2019-11-29 kn Regular expression syntax is documented in
749 6841bf13 2019-11-29 kn .Xr re_format 7 .
750 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
751 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
752 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
753 04ca23f4 2018-07-16 stsp working directory.
754 e9cf2e30 2019-02-05 stsp If this directory is a
756 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
758 dbec59df 2020-04-18 stsp Determine a set of commits to display as usual, but display these commits
759 dbec59df 2020-04-18 stsp in reverse order.
760 d1fe46f9 2020-04-18 stsp .It Fl x Ar commit
761 52ab7958 2020-04-18 stsp Stop traversing commit history as soon as the specified
763 52ab7958 2020-04-18 stsp has been traversed.
764 d1fe46f9 2020-04-18 stsp This option has no effect if the specified
766 d1fe46f9 2020-04-18 stsp is never traversed.
768 63035f9f 2019-10-06 stsp .It Cm diff 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
769 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
770 bd81cfb7 2020-04-19 stsp local changes in the work tree.
773 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
775 d24820bf 2019-08-11 stsp If two arguments are provided, treat each argument as a reference, a tag
776 d24820bf 2019-08-11 stsp name, or an object ID SHA1 hash, and display differences between the
777 d24820bf 2019-08-11 stsp corresponding objects.
778 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
779 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
780 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
782 c0cc5c62 2018-10-18 stsp The options for
783 c0cc5c62 2018-10-18 stsp .Cm got diff
784 c0cc5c62 2018-10-18 stsp are as follows:
785 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
786 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
787 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
788 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
789 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
790 b72f483a 2019-02-05 stsp Use the repository at the specified path.
791 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
792 b72f483a 2019-02-05 stsp working directory.
793 b72f483a 2019-02-05 stsp If this directory is a
795 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
797 4ed9f614 2019-08-04 stsp Show changes staged with
798 4ed9f614 2019-08-04 stsp .Cm got stage
799 bd81cfb7 2020-04-19 stsp instead of showing local changes in the work tree.
800 4ed9f614 2019-08-04 stsp This option is only valid when
801 4ed9f614 2019-08-04 stsp .Cm got diff
802 4ed9f614 2019-08-04 stsp is invoked in a work tree.
804 63035f9f 2019-10-06 stsp Ignore whitespace-only changes.
807 bc26cce8 2019-08-04 stsp Short alias for
809 dfc23429 2019-08-11 stsp .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
810 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
812 1ff8e573 2018-08-02 stsp The options for
813 1ff8e573 2018-08-02 stsp .Cm got blame
814 1ff8e573 2018-08-02 stsp are as follows:
815 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
816 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
817 1ff8e573 2018-08-02 stsp Start traversing history at the specified
818 1ff8e573 2018-08-02 stsp .Ar commit .
819 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
820 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
821 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
822 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
823 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
824 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
825 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
826 1ff8e573 2018-08-02 stsp working directory.
827 0c06baac 2019-02-05 stsp If this directory is a
829 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
832 bc26cce8 2019-08-04 stsp Short alias for
833 bc26cce8 2019-08-04 stsp .Cm blame .
834 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
835 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
836 5de5890b 2018-10-18 stsp directory path in the repository.
837 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
838 db0c2996 2019-02-10 stsp annotations:
839 db0c2996 2019-02-10 stsp .Bl -column YXZ description
840 848d6979 2019-08-12 stsp .It @ Ta entry is a symbolic link
841 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
842 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
843 63c5ca5d 2019-08-24 stsp .It $ Ta entry is a Git submodule
846 0d6c6ee3 2020-05-20 stsp Symbolic link entries are also annotated with the target path of the link.
850 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
851 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
852 0c849583 2019-02-05 stsp if there is no work tree.
854 5de5890b 2018-10-18 stsp The options for
855 5de5890b 2018-10-18 stsp .Cm got tree
856 5de5890b 2018-10-18 stsp are as follows:
857 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
858 5de5890b 2018-10-18 stsp .It Fl c Ar commit
859 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
860 5de5890b 2018-10-18 stsp .Ar commit .
861 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
862 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
863 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
864 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
865 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
866 5de5890b 2018-10-18 stsp Use the repository at the specified path.
867 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
868 5de5890b 2018-10-18 stsp working directory.
869 0c849583 2019-02-05 stsp If this directory is a
871 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
873 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
875 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
878 bc26cce8 2019-08-04 stsp Short alias for
880 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
881 d0eebce4 2019-03-11 stsp Manage references in a repository.
883 e31abbf2 2020-03-22 stsp References may be listed, created, deleted, and changed.
884 e31abbf2 2020-03-22 stsp When creating, deleting, or changing a reference the specified
886 e31abbf2 2020-03-22 stsp must be an absolute reference name, i.e. it must begin with
887 f16e4044 2019-10-09 stsp .Dq refs/ .
889 d0eebce4 2019-03-11 stsp The options for
890 d0eebce4 2019-03-11 stsp .Cm got ref
891 d0eebce4 2019-03-11 stsp are as follows:
892 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
893 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
894 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
895 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
896 d0eebce4 2019-03-11 stsp working directory.
897 d0eebce4 2019-03-11 stsp If this directory is a
899 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
901 b2070a3f 2020-03-22 stsp List references in the repository.
904 b2070a3f 2020-03-22 stsp is specified, list all existing references in the repository.
907 b2070a3f 2020-03-22 stsp is a reference namespace, list all references in this namespace.
908 b2070a3f 2020-03-22 stsp Otherwise, show only the reference with the given
910 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
912 e31abbf2 2020-03-22 stsp .It Fl c Ar object
913 e31abbf2 2020-03-22 stsp Create a reference or change an existing reference.
914 e31abbf2 2020-03-22 stsp The reference with the specified
916 e31abbf2 2020-03-22 stsp will point at the specified
917 e31abbf2 2020-03-22 stsp .Ar object.
918 e31abbf2 2020-03-22 stsp The expected
920 e31abbf2 2020-03-22 stsp argument is a ID SHA1 hash or an existing reference or tag name which will
921 e31abbf2 2020-03-22 stsp be resolved to the ID of a corresponding commit, tree, tag, or blob object.
922 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
924 e31abbf2 2020-03-22 stsp .It Fl s Ar reference
925 e31abbf2 2020-03-22 stsp Create a symbolic reference, or change an existing symbolic reference.
926 e31abbf2 2020-03-22 stsp The symbolic reference with the specified
928 e31abbf2 2020-03-22 stsp will point at the specified
929 e31abbf2 2020-03-22 stsp .Ar reference
930 e31abbf2 2020-03-22 stsp which must already exist in the repository.
931 d1c1ae5f 2019-08-12 stsp Care should be taken not to create loops between references when
932 d1c1ae5f 2019-08-12 stsp this option is used.
933 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
936 e31abbf2 2020-03-22 stsp Delete the reference with the specified
938 e31abbf2 2020-03-22 stsp from the repository.
939 e31abbf2 2020-03-22 stsp Cannot be used together with any other options except
942 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
943 da76fce2 2020-02-24 stsp Create, list, or delete branches.
945 4e759de4 2019-06-26 stsp Branches are managed via references which live in the
946 4e759de4 2019-06-26 stsp .Dq refs/heads/
947 4e759de4 2019-06-26 stsp reference namespace.
949 4e759de4 2019-06-26 stsp .Cm got branch
950 4e759de4 2019-06-26 stsp command operates on references in this namespace only.
952 ad89fa31 2019-10-04 stsp If invoked in a work tree without any arguments, print the name of the
953 ad89fa31 2019-10-04 stsp work tree's current branch.
957 a74f7e83 2019-11-10 stsp argument is passed, attempt to create a branch reference with the given name.
958 a74f7e83 2019-11-10 stsp By default the new branch reference will point at the latest commit on the
959 a74f7e83 2019-11-10 stsp work tree's current branch if invoked in a work tree, and otherwise to a commit
960 a74f7e83 2019-11-10 stsp resolved via the repository's HEAD reference.
962 da76fce2 2020-02-24 stsp If invoked in a work tree, once the branch was created successfully
963 da76fce2 2020-02-24 stsp switch the work tree's head reference to the newly created branch and
964 da76fce2 2020-02-24 stsp update files across the entire work tree, just like
965 da76fce2 2020-02-24 stsp .Cm got update -b Ar name
967 da76fce2 2020-02-24 stsp Show the status of each affected file, using the following status codes:
968 da76fce2 2020-02-24 stsp .Bl -column YXZ description
969 da76fce2 2020-02-24 stsp .It U Ta file was updated and contained no local changes
970 da76fce2 2020-02-24 stsp .It G Ta file was updated and local changes were merged cleanly
971 da76fce2 2020-02-24 stsp .It C Ta file was updated and conflicts occurred during merge
972 da76fce2 2020-02-24 stsp .It D Ta file was deleted
973 da76fce2 2020-02-24 stsp .It A Ta new file was added
974 da76fce2 2020-02-24 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
975 da76fce2 2020-02-24 stsp .It ! Ta a missing versioned file was restored
978 4e759de4 2019-06-26 stsp The options for
979 4e759de4 2019-06-26 stsp .Cm got branch
980 4e759de4 2019-06-26 stsp are as follows:
981 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
982 a74f7e83 2019-11-10 stsp .It Fl c Ar commit
983 a74f7e83 2019-11-10 stsp Make a newly created branch reference point at the specified
984 a74f7e83 2019-11-10 stsp .Ar commit .
985 a74f7e83 2019-11-10 stsp The expected
987 a74f7e83 2019-11-10 stsp argument is a commit ID SHA1 hash or an existing reference
988 a74f7e83 2019-11-10 stsp or tag name which will be resolved to a commit ID.
989 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
990 4e759de4 2019-06-26 stsp Use the repository at the specified path.
991 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
992 4e759de4 2019-06-26 stsp working directory.
993 4e759de4 2019-06-26 stsp If this directory is a
995 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
997 4e759de4 2019-06-26 stsp List all existing branches in the repository.
998 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
999 ba882ee3 2019-07-11 stsp with one the following annotations:
1000 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
1001 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
1002 1dd86744 2019-08-12 anthony .It \(a~ Ta work tree's base commit is out-of-date
1004 4e759de4 2019-06-26 stsp .It Fl d Ar name
1005 4e759de4 2019-06-26 stsp Delete the branch with the specified name from the repository.
1006 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
1007 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
1008 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
1009 ce33d90e 2019-07-14 stsp Git's garbage collector.
1011 da76fce2 2020-02-24 stsp Do not switch and update the work tree after creating a new branch.
1014 97b3a7be 2019-07-09 stsp Short alias for
1015 97b3a7be 2019-07-09 stsp .Cm branch .
1016 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
1017 8e7bd50a 2019-08-22 stsp Manage tags in a repository.
1019 8e7bd50a 2019-08-22 stsp Tags are managed via references which live in the
1020 8e7bd50a 2019-08-22 stsp .Dq refs/tags/
1021 8e7bd50a 2019-08-22 stsp reference namespace.
1023 8e7bd50a 2019-08-22 stsp .Cm got tag
1024 8e7bd50a 2019-08-22 stsp command operates on references in this namespace only.
1025 b3cd068e 2019-08-22 stsp References in this namespace point at tag objects which contain a pointer
1026 b3cd068e 2019-08-22 stsp to another object, a tag message, as well as author and timestamp information.
1028 80106605 2020-02-24 stsp Attempt to create a tag with the given
1029 8e7bd50a 2019-08-22 stsp .Ar name ,
1030 8e7bd50a 2019-08-22 stsp and make this tag point at the given
1031 8e7bd50a 2019-08-22 stsp .Ar commit .
1032 8e7bd50a 2019-08-22 stsp If no commit is specified, default to the latest commit on the work tree's
1033 8e7bd50a 2019-08-22 stsp current branch if invoked in a work tree, and to a commit resolved via
1034 8e7bd50a 2019-08-22 stsp the repository's HEAD reference otherwise.
1036 8e7bd50a 2019-08-22 stsp The options for
1037 8e7bd50a 2019-08-22 stsp .Cm got tag
1038 8e7bd50a 2019-08-22 stsp are as follows:
1039 8e7bd50a 2019-08-22 stsp .Bl -tag -width Ds
1040 80106605 2020-02-24 stsp .It Fl c Ar commit
1041 80106605 2020-02-24 stsp Make the newly created tag reference point at the specified
1042 80106605 2020-02-24 stsp .Ar commit .
1043 80106605 2020-02-24 stsp The expected
1044 80106605 2020-02-24 stsp .Ar commit
1045 80106605 2020-02-24 stsp argument is a commit ID SHA1 hash or an existing reference or tag name which
1046 80106605 2020-02-24 stsp will be resolved to a commit ID.
1047 80106605 2020-02-24 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1048 80106605 2020-02-24 stsp automatically, provided the abbreviation is unique.
1049 8e7bd50a 2019-08-22 stsp .It Fl m Ar message
1050 80106605 2020-02-24 stsp Use the specified tag message when creating the new tag.
1051 8e7bd50a 2019-08-22 stsp Without the
1054 3a62228f 2019-11-08 stsp .Cm got tag
1055 8e7bd50a 2019-08-22 stsp opens a temporary file in an editor where a tag message can be written.
1056 8e7bd50a 2019-08-22 stsp .It Fl r Ar repository-path
1057 8e7bd50a 2019-08-22 stsp Use the repository at the specified path.
1058 8e7bd50a 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1059 8e7bd50a 2019-08-22 stsp working directory.
1060 8e7bd50a 2019-08-22 stsp If this directory is a
1062 8e7bd50a 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1064 8e7bd50a 2019-08-22 stsp List all existing tags in the repository instead of creating a new tag.
1065 8e7bd50a 2019-08-22 stsp If this option is used, no other command-line arguments are allowed.
1068 8e7bd50a 2019-08-22 stsp By design, the
1069 8e7bd50a 2019-08-22 stsp .Cm got tag
1070 8e7bd50a 2019-08-22 stsp command will not delete tags or change existing tags.
1071 8e7bd50a 2019-08-22 stsp If a tag must be deleted, the
1072 8e7bd50a 2019-08-22 stsp .Cm got ref
1073 8e7bd50a 2019-08-22 stsp command may be used to delete a tag's reference.
1074 8e7bd50a 2019-08-22 stsp This should only be done if the tag has not already been copied to
1075 8e7bd50a 2019-08-22 stsp another repository.
1076 022fae89 2019-12-06 tracey .It Cm add Oo Fl R Oc Oo Fl I Oc Ar path ...
1077 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
1078 d00136be 2019-03-26 stsp repository in the next commit.
1080 4e68cba3 2019-11-23 stsp The options for
1081 4e68cba3 2019-11-23 stsp .Cm got add
1082 4e68cba3 2019-11-23 stsp are as follows:
1083 4e68cba3 2019-11-23 stsp .Bl -tag -width Ds
1085 4e68cba3 2019-11-23 stsp Permit recursion into directories.
1086 4e68cba3 2019-11-23 stsp If this option is not specified,
1087 4e68cba3 2019-11-23 stsp .Cm got add
1088 4e68cba3 2019-11-23 stsp will refuse to run if a specified
1090 4e68cba3 2019-11-23 stsp is a directory.
1091 022fae89 2019-12-06 tracey .It Fl I
1092 022fae89 2019-12-06 tracey With -R, add files even if they match a
1093 022fae89 2019-12-06 tracey .Cm got status
1094 022fae89 2019-12-06 tracey ignore pattern.
1096 c29c428a 2019-12-16 stsp .It Cm remove Oo Fl f Oc Oo Fl k Oc Oo Fl R Oc Ar path ...
1097 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
1098 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
1100 2ec1f75b 2019-03-26 stsp The options for
1101 86d25a1b 2019-07-11 stsp .Cm got remove
1102 2ec1f75b 2019-03-26 stsp are as follows:
1103 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
1105 bd81cfb7 2020-04-19 stsp Perform the operation even if a file contains local modifications.
1106 70e3e7f5 2019-12-13 tracey .It Fl k
1107 70e3e7f5 2019-12-13 tracey Keep affected files on disk.
1108 f2a9dc41 2019-12-13 tracey .It Fl R
1109 f2a9dc41 2019-12-13 tracey Permit recursion into directories.
1110 f2a9dc41 2019-12-13 tracey If this option is not specified,
1111 f2a9dc41 2019-12-13 tracey .Cm got remove
1112 f2a9dc41 2019-12-13 tracey will refuse to run if a specified
1113 f2a9dc41 2019-12-13 tracey .Ar path
1114 f2a9dc41 2019-12-13 tracey is a directory.
1117 648e4ef7 2019-07-09 stsp Short alias for
1118 648e4ef7 2019-07-09 stsp .Cm remove .
1119 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 ...
1120 bd81cfb7 2020-04-19 stsp Revert any local changes in files at the specified paths in a work tree.
1121 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
1122 1dd86744 2019-08-12 anthony work tree's base commit.
1123 1dd86744 2019-08-12 anthony There is no way to bring discarded changes back after
1124 a129376b 2019-03-28 stsp .Cm got revert !
1126 e20a8b6f 2019-06-04 stsp If a file was added with
1127 a129376b 2019-03-28 stsp .Cm got add
1128 a129376b 2019-03-28 stsp it will become an unversioned file again.
1129 e20a8b6f 2019-06-04 stsp If a file was deleted with
1130 86d25a1b 2019-07-11 stsp .Cm got remove
1131 a129376b 2019-03-28 stsp it will be restored.
1133 0f6d7415 2019-08-08 stsp The options for
1134 0f6d7415 2019-08-08 stsp .Cm got revert
1135 0f6d7415 2019-08-08 stsp are as follows:
1136 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
1138 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
1139 33aa809d 2019-08-08 stsp changes to revert based on
1141 33aa809d 2019-08-08 stsp (revert change),
1143 33aa809d 2019-08-08 stsp (keep change), and
1145 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
1146 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
1147 33aa809d 2019-08-08 stsp modified file content can be reverted.
1148 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
1149 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
1152 33aa809d 2019-08-08 stsp option, read
1157 33aa809d 2019-08-08 stsp responses line-by-line from the specified
1158 33aa809d 2019-08-08 stsp .Ar response-script
1159 33aa809d 2019-08-08 stsp file instead of prompting interactively.
1161 0f6d7415 2019-08-08 stsp Permit recursion into directories.
1162 0f6d7415 2019-08-08 stsp If this option is not specified,
1163 0f6d7415 2019-08-08 stsp .Cm got revert
1164 0f6d7415 2019-08-08 stsp will refuse to run if a specified
1166 0f6d7415 2019-08-08 stsp is a directory.
1169 97b3a7be 2019-07-09 stsp Short alias for
1170 97b3a7be 2019-07-09 stsp .Cm revert .
1171 dfc23429 2019-08-11 stsp .It Cm commit Oo Fl m Ar message Oc Op Ar path ...
1172 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
1173 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
1176 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
1177 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
1179 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
1180 1dd86744 2019-08-12 anthony .Cm got stage ,
1181 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
1182 4ed9f614 2019-08-04 stsp have not been staged.
1184 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
1185 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
1186 15cd91f7 2019-05-12 stsp .It M Ta modified file
1187 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
1188 15cd91f7 2019-05-12 stsp .It A Ta new file was added
1189 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
1192 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
1193 996d5ccd 2019-08-05 stsp recorded base commit.
1196 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
1197 15cd91f7 2019-05-12 stsp multiple base commits.
1198 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
1199 47ec7be7 2019-05-12 stsp .Cm got update
1200 47ec7be7 2019-05-12 stsp across the entire work tree.
1203 15cd91f7 2019-05-12 stsp .Cm got commit
1204 15cd91f7 2019-05-12 stsp command requires the
1205 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
1206 aba9c984 2019-09-08 stsp environment variable to be set,
1207 aba9c984 2019-09-08 stsp unless Git's
1208 aba9c984 2019-09-08 stsp .Dv user.name
1210 709ae9eb 2019-09-08 stsp .Dv user.email
1211 709ae9eb 2019-09-08 stsp configuration settings can be
1212 aba9c984 2019-09-08 stsp obtained from the repository's
1213 aba9c984 2019-09-08 stsp .Pa .git/config
1214 c9956ddf 2019-09-08 stsp file or from Git's global
1215 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1216 c9956ddf 2019-09-08 stsp configuration file.
1218 74416c47 2019-05-09 stsp The options for
1219 74416c47 2019-05-09 stsp .Cm got commit
1220 74416c47 2019-05-09 stsp are as follows:
1221 74416c47 2019-05-09 stsp .Bl -tag -width Ds
1222 74ff3f23 2019-07-07 stsp .It Fl m Ar message
1223 74416c47 2019-05-09 stsp Use the specified log message when creating the new commit.
1224 23594da9 2019-05-13 stsp Without the
1227 23594da9 2019-05-13 stsp .Cm got commit
1228 23594da9 2019-05-13 stsp opens a temporary file in an editor where a log message can be written.
1231 cfce0458 2019-07-28 stsp .Cm got commit
1232 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
1233 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
1234 916f288c 2019-07-30 stsp .Dq refs/heads/
1235 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
1236 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
1237 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
1238 cfce0458 2019-07-28 stsp If a path is found to be out of date,
1239 cfce0458 2019-07-28 stsp .Cm got update
1240 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
1241 cfce0458 2019-07-28 stsp in the repository.
1243 97b3a7be 2019-07-09 stsp Short alias for
1244 97b3a7be 2019-07-09 stsp .Cm commit .
1245 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
1246 234035bc 2019-06-01 stsp Merge changes from a single
1247 234035bc 2019-06-01 stsp .Ar commit
1248 234035bc 2019-06-01 stsp into the work tree.
1249 234035bc 2019-06-01 stsp The specified
1250 234035bc 2019-06-01 stsp .Ar commit
1251 234035bc 2019-06-01 stsp must be on a different branch than the work tree's base commit.
1252 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
1253 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1254 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
1256 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
1257 234035bc 2019-06-01 stsp .Bl -column YXZ description
1258 234035bc 2019-06-01 stsp .It G Ta file was merged
1259 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
1260 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
1261 234035bc 2019-06-01 stsp .It D Ta file was deleted
1262 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
1263 234035bc 2019-06-01 stsp .It A Ta new file was added
1264 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1267 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
1268 234035bc 2019-06-01 stsp may be viewed with
1269 234035bc 2019-06-01 stsp .Cm got diff ,
1270 234035bc 2019-06-01 stsp amended manually or with further
1271 234035bc 2019-06-01 stsp .Cm got cherrypick
1273 234035bc 2019-06-01 stsp committed with
1274 234035bc 2019-06-01 stsp .Cm got commit ,
1275 234035bc 2019-06-01 stsp or discarded again with
1276 234035bc 2019-06-01 stsp .Cm got revert .
1278 234035bc 2019-06-01 stsp .Cm got cherrypick
1279 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
1280 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
1281 234035bc 2019-06-01 stsp to a single base commit with
1282 234035bc 2019-06-01 stsp .Cm got update .
1283 234035bc 2019-06-01 stsp If the work tree already contains files with merge conflicts, these
1284 234035bc 2019-06-01 stsp conflicts must be resolved first.
1286 97b3a7be 2019-07-09 stsp Short alias for
1287 97b3a7be 2019-07-09 stsp .Cm cherrypick .
1288 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
1289 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
1290 5ef14e63 2019-06-02 stsp .Ar commit
1291 5ef14e63 2019-06-02 stsp into the work tree.
1292 5ef14e63 2019-06-02 stsp The specified
1293 5ef14e63 2019-06-02 stsp .Ar commit
1294 5ef14e63 2019-06-02 stsp must be on the same branch as the work tree's base commit.
1295 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
1296 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1297 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
1299 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
1300 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
1301 5ef14e63 2019-06-02 stsp .It G Ta file was merged
1302 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
1303 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
1304 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
1305 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
1306 5ef14e63 2019-06-02 stsp .It A Ta new file was added
1307 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1310 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
1311 5ef14e63 2019-06-02 stsp which may be viewed with
1312 5ef14e63 2019-06-02 stsp .Cm got diff ,
1313 5ef14e63 2019-06-02 stsp amended manually or with further
1314 778a73c2 2019-07-12 stsp .Cm got backout
1316 5ef14e63 2019-06-02 stsp committed with
1317 5ef14e63 2019-06-02 stsp .Cm got commit ,
1318 5ef14e63 2019-06-02 stsp or discarded again with
1319 5ef14e63 2019-06-02 stsp .Cm got revert .
1321 92228c38 2019-06-02 stsp .Cm got backout
1322 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
1323 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
1324 92228c38 2019-06-02 stsp to a single base commit with
1325 92228c38 2019-06-02 stsp .Cm got update .
1326 92228c38 2019-06-02 stsp If the work tree already contains files with merge conflicts, these
1327 92228c38 2019-06-02 stsp conflicts must be resolved first.
1329 97b3a7be 2019-07-09 stsp Short alias for
1330 97b3a7be 2019-07-09 stsp .Cm backout .
1331 dfc23429 2019-08-11 stsp .It Cm rebase Oo Fl a Oc Oo Fl c Oc Op Ar branch
1332 818c7501 2019-07-11 stsp Rebase commits on the specified
1333 818c7501 2019-07-11 stsp .Ar branch
1334 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
1336 818c7501 2019-07-11 stsp .Ar branch
1337 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
1338 bc3056e3 2019-08-18 stsp Rebasing begins with the first descendant commit of the youngest
1339 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
1340 818c7501 2019-07-11 stsp .Ar branch
1341 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
1342 f09e2405 2019-07-11 stsp of the specified
1343 818c7501 2019-07-11 stsp .Ar branch
1344 f09e2405 2019-07-11 stsp has been rebased.
1347 2b6826ba 2020-02-24 stsp .Cm got rebase
1348 2b6826ba 2020-02-24 stsp is used as intended, the specified
1349 2b6826ba 2020-02-24 stsp .Ar branch
1350 c10890ce 2020-02-25 stsp represents a local commit history and may already contain changes
1351 c10890ce 2020-02-25 stsp that are not yet visible in any other repositories.
1352 2b6826ba 2020-02-24 stsp The work tree's current branch, which must be set with
1353 2b6826ba 2020-02-24 stsp .Cm got update -b
1354 2b6826ba 2020-02-24 stsp before starting the
1355 2b6826ba 2020-02-24 stsp .Cm rebase
1356 2b6826ba 2020-02-24 stsp operation, represents a branch from a remote repository which shares
1357 2b6826ba 2020-02-24 stsp a common history with the specified
1358 2b6826ba 2020-02-24 stsp .Ar branch
1359 c10890ce 2020-02-25 stsp but has progressed, and perhaps diverged, due to commits added to the
1360 c10890ce 2020-02-25 stsp remote repository.
1362 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
1363 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
1364 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
1365 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
1366 818c7501 2019-07-11 stsp .Ar branch ,
1367 818c7501 2019-07-11 stsp but with different commit IDs.
1368 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
1369 f09e2405 2019-07-11 stsp the new version of the specified
1370 818c7501 2019-07-11 stsp .Ar branch
1371 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
1373 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
1374 818c7501 2019-07-11 stsp using the following status codes:
1375 818c7501 2019-07-11 stsp .Bl -column YXZ description
1376 818c7501 2019-07-11 stsp .It G Ta file was merged
1377 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
1378 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
1379 818c7501 2019-07-11 stsp .It D Ta file was deleted
1380 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
1381 818c7501 2019-07-11 stsp .It A Ta new file was added
1382 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1385 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
1386 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
1387 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
1388 818c7501 2019-07-11 stsp .Ar branch
1389 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
1391 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
1392 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
1393 f09e2405 2019-07-11 stsp when the rebase operation continues.
1395 818c7501 2019-07-11 stsp .Cm got rebase
1396 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
1397 a85446b2 2020-01-04 stsp If the work tree is not yet fully updated to the tip commit of its
1398 a85446b2 2020-01-04 stsp branch then the work tree must first be updated with
1399 818c7501 2019-07-11 stsp .Cm got update .
1400 4ed9f614 2019-08-04 stsp If changes have been staged with
1401 4ed9f614 2019-08-04 stsp .Cm got stage ,
1402 bc3056e3 2019-08-18 stsp these changes must first be committed with
1403 4ed9f614 2019-08-04 stsp .Cm got commit
1404 4ed9f614 2019-08-04 stsp or unstaged with
1405 4ed9f614 2019-08-04 stsp .Cm got unstage .
1406 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
1407 f09e2405 2019-07-11 stsp committed with
1408 f09e2405 2019-07-11 stsp .Cm got commit
1409 f09e2405 2019-07-11 stsp or reverted with
1410 f09e2405 2019-07-11 stsp .Cm got revert .
1412 64c6d990 2019-07-11 stsp .Ar branch
1413 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
1414 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
1417 7d5807f4 2019-07-11 stsp .Cm got update
1419 7d5807f4 2019-07-11 stsp .Cm got commit
1420 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
1421 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
1422 7d5807f4 2019-07-11 stsp conflict resolution purposes.
1424 818c7501 2019-07-11 stsp The options for
1425 818c7501 2019-07-11 stsp .Cm got rebase
1426 818c7501 2019-07-11 stsp are as follows:
1427 818c7501 2019-07-11 stsp .Bl -tag -width Ds
1429 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
1430 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1432 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
1433 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1436 818c7501 2019-07-11 stsp Short alias for
1437 818c7501 2019-07-11 stsp .Cm rebase .
1438 083957f4 2020-02-24 stsp .It Cm histedit Oo Fl a Oc Oo Fl c Oc Oo Fl F Ar histedit-script Oc Oo Fl m Oc
1439 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
1440 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
1442 6e54d307 2020-02-24 stsp Before starting a
1443 6e54d307 2020-02-24 stsp .Cm histedit
1444 6e54d307 2020-02-24 stsp operation the work tree's current branch must be set with
1445 6e54d307 2020-02-24 stsp .Cm got update -b
1446 6e54d307 2020-02-24 stsp to the branch which should be edited, unless this branch is already the
1447 6e54d307 2020-02-24 stsp current branch of the work tree.
1448 6e54d307 2020-02-24 stsp The tip of this branch represents the upper bound (inclusive) of commits
1449 6e54d307 2020-02-24 stsp touched by the
1450 6e54d307 2020-02-24 stsp .Cm histedit
1451 6e54d307 2020-02-24 stsp operation.
1453 6e54d307 2020-02-24 stsp Furthermore, the work tree's base commit
1454 6e54d307 2020-02-24 stsp must be set with
1455 6e54d307 2020-02-24 stsp .Cm got update -c
1456 6e54d307 2020-02-24 stsp to a point in this branch's commit history where editing should begin.
1457 6e54d307 2020-02-24 stsp This commit represents the lower bound (non-inclusive) of commits touched
1459 6e54d307 2020-02-24 stsp .Cm histedit
1460 6e54d307 2020-02-24 stsp operation.
1462 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
1463 0ebf8283 2019-07-24 stsp .Ar histedit script
1464 46fa4c83 2020-02-24 stsp which can be written in an editor based on a template, passed on the
1465 46fa4c83 2020-02-24 stsp command line, or generated with the
1467 083957f4 2020-02-24 stsp option if only log messages need to be edited.
1469 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
1470 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
1471 0ebf8283 2019-07-24 stsp whitespace and an argument.
1472 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
1473 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
1474 0ebf8283 2019-07-24 stsp Lines which begin with the
1476 0ebf8283 2019-07-24 stsp character are ignored entirely.
1478 0ebf8283 2019-07-24 stsp The available commands are as follows:
1479 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
1480 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
1481 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
1482 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
1483 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
1484 0ebf8283 2019-07-24 stsp listed further below that will be used.
1485 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
1486 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
1487 0ebf8283 2019-07-24 stsp the commit on the previous line.
1488 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
1489 0ebf8283 2019-07-24 stsp log message can be written.
1492 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
1493 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
1494 5b87815e 2020-03-05 stsp No commit may be listed more than once.
1496 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
1497 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
1498 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
1499 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
1500 498a90b7 2019-07-25 stsp switched to it.
1502 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
1503 0ebf8283 2019-07-24 stsp using the following status codes:
1504 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
1505 0ebf8283 2019-07-24 stsp .It G Ta file was merged
1506 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
1507 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
1508 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
1509 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
1510 0ebf8283 2019-07-24 stsp .It A Ta new file was added
1511 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1514 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
1515 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
1516 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
1517 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
1519 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
1520 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
1521 0ebf8283 2019-07-24 stsp when the histedit operation continues.
1523 0ebf8283 2019-07-24 stsp .Cm got histedit
1524 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
1525 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
1526 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
1527 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
1528 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
1529 0ebf8283 2019-07-24 stsp to a single base commit with
1530 0ebf8283 2019-07-24 stsp .Cm got update .
1531 4ed9f614 2019-08-04 stsp If changes have been staged with
1532 4ed9f614 2019-08-04 stsp .Cm got stage ,
1533 bc3056e3 2019-08-18 stsp these changes must first be committed with
1534 4ed9f614 2019-08-04 stsp .Cm got commit
1535 4ed9f614 2019-08-04 stsp or unstaged with
1536 4ed9f614 2019-08-04 stsp .Cm got unstage .
1537 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
1538 0ebf8283 2019-07-24 stsp committed with
1539 0ebf8283 2019-07-24 stsp .Cm got commit
1540 0ebf8283 2019-07-24 stsp or reverted with
1541 0ebf8283 2019-07-24 stsp .Cm got revert .
1542 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
1543 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
1546 7ef62c4e 2020-02-24 stsp .Cm got update ,
1547 7ef62c4e 2020-02-24 stsp .Cm got rebase ,
1549 65db4ffb 2020-02-24 stsp .Cm got integrate
1550 65db4ffb 2020-02-24 stsp commands will refuse to run while a histedit operation is in progress.
1551 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
1552 0ebf8283 2019-07-24 stsp .Cm got commit
1553 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
1554 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
1556 0ebf8283 2019-07-24 stsp The options for
1557 0ebf8283 2019-07-24 stsp .Cm got histedit
1558 0ebf8283 2019-07-24 stsp are as follows:
1559 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
1561 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
1562 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1564 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
1565 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1566 ddbfac99 2020-02-24 stsp .It Fl F Ar histedit-script
1567 ddbfac99 2020-02-24 stsp Use the specified
1568 ddbfac99 2020-02-24 stsp .Ar histedit-script
1569 ddbfac99 2020-02-24 stsp instead of opening a temporary file in an editor where a histedit script
1570 ddbfac99 2020-02-24 stsp can be written.
1572 083957f4 2020-02-24 stsp Edit log messages only.
1573 083957f4 2020-02-24 stsp This option is a quick equivalent to a histedit script which edits
1574 2bdefe56 2020-02-24 tracey only log messages but otherwise leaves every picked commit as-is.
1577 083957f4 2020-02-24 stsp option can only be used when starting a new histedit operation.
1578 083957f4 2020-02-24 stsp If this option is used, no other command-line arguments are allowed.
1581 0ebf8283 2019-07-24 stsp Short alias for
1582 0ebf8283 2019-07-24 stsp .Cm histedit .
1583 2822a352 2019-10-15 stsp .It Cm integrate Ar branch
1584 2822a352 2019-10-15 stsp Integrate the specified
1585 2822a352 2019-10-15 stsp .Ar branch
1586 2822a352 2019-10-15 stsp into the work tree's current branch.
1587 2822a352 2019-10-15 stsp Files in the work tree are updated to match the contents on the integrated
1588 2822a352 2019-10-15 stsp .Ar branch ,
1589 2822a352 2019-10-15 stsp and the reference of the work tree's branch is changed to point at the
1590 2822a352 2019-10-15 stsp head commit of the integrated
1591 2822a352 2019-10-15 stsp .Ar branch .
1593 2822a352 2019-10-15 stsp Both branches can be considered equivalent after integration since they
1594 2822a352 2019-10-15 stsp will be pointing at the same commit.
1595 2822a352 2019-10-15 stsp Both branches remain available for future work, if desired.
1596 2822a352 2019-10-15 stsp In case the integrated
1597 2822a352 2019-10-15 stsp .Ar branch
1598 2822a352 2019-10-15 stsp is no longer needed it may be deleted with
1599 2822a352 2019-10-15 stsp .Cm got branch -d .
1601 2822a352 2019-10-15 stsp Show the status of each affected file, using the following status codes:
1602 2822a352 2019-10-15 stsp .Bl -column YXZ description
1603 2822a352 2019-10-15 stsp .It U Ta file was updated
1604 2822a352 2019-10-15 stsp .It D Ta file was deleted
1605 2822a352 2019-10-15 stsp .It A Ta new file was added
1606 2822a352 2019-10-15 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
1607 2822a352 2019-10-15 stsp .It ! Ta a missing versioned file was restored
1610 2822a352 2019-10-15 stsp .Cm got integrate
1611 2822a352 2019-10-15 stsp will refuse to run if certain preconditions are not met.
1612 2822a352 2019-10-15 stsp Most importantly, the
1613 2822a352 2019-10-15 stsp .Ar branch
1614 2822a352 2019-10-15 stsp must have been rebased onto the work tree's current branch with
1615 2822a352 2019-10-15 stsp .Cm got rebase
1616 2822a352 2019-10-15 stsp before it can be integrated, in order to linearize commit history and
1617 2822a352 2019-10-15 stsp resolve merge conflicts.
1618 2822a352 2019-10-15 stsp If the work tree contains multiple base commits it must first be updated
1619 2822a352 2019-10-15 stsp to a single base commit with
1620 2822a352 2019-10-15 stsp .Cm got update .
1621 2822a352 2019-10-15 stsp If changes have been staged with
1622 2822a352 2019-10-15 stsp .Cm got stage ,
1623 2822a352 2019-10-15 stsp these changes must first be committed with
1624 2822a352 2019-10-15 stsp .Cm got commit
1625 2822a352 2019-10-15 stsp or unstaged with
1626 2822a352 2019-10-15 stsp .Cm got unstage .
1627 2822a352 2019-10-15 stsp If the work tree contains local changes, these changes must first be
1628 2822a352 2019-10-15 stsp committed with
1629 2822a352 2019-10-15 stsp .Cm got commit
1630 2822a352 2019-10-15 stsp or reverted with
1631 2822a352 2019-10-15 stsp .Cm got revert .
1633 2822a352 2019-10-15 stsp Short alias for
1634 2822a352 2019-10-15 stsp .Cm integrate .
1635 dfc23429 2019-08-11 stsp .It Cm stage Oo Fl l Oc Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
1636 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
1639 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
1640 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
1641 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
1642 4ed9f614 2019-08-04 stsp .Cm got status .
1644 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1645 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
1646 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
1647 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
1648 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
1651 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
1652 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
1653 9d8b19a4 2019-08-04 stsp committed.
1655 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
1656 4ed9f614 2019-08-04 stsp .Cm got commit ,
1657 4ed9f614 2019-08-04 stsp .Cm got status ,
1659 4ed9f614 2019-08-04 stsp .Cm got diff .
1660 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
1661 4ed9f614 2019-08-04 stsp .Cm got commit
1662 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
1663 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
1664 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
1666 4ed9f614 2019-08-04 stsp .Cm got status
1667 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
1669 4ed9f614 2019-08-04 stsp .Cm got diff
1670 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
1671 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
1673 4ed9f614 2019-08-04 stsp .Cm got revert
1674 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
1675 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
1677 4ed9f614 2019-08-04 stsp The options for
1678 4ed9f614 2019-08-04 stsp .Cm got stage
1679 4ed9f614 2019-08-04 stsp are as follows:
1680 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
1682 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
1683 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
1684 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
1685 1dd86744 2019-08-12 anthony among the specified paths.
1686 1dd86744 2019-08-12 anthony Otherwise, show all staged paths.
1688 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
1689 dc424a06 2019-08-07 stsp select or reject changes for staging based on
1691 6d23ec10 2019-08-08 stsp (stage change),
1693 6d23ec10 2019-08-08 stsp (reject change), and
1695 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
1696 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
1697 dc424a06 2019-08-07 stsp modified file content can be staged.
1698 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
1699 6d23ec10 2019-08-08 stsp their entirety.
1700 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
1703 3a070a2b 2019-08-07 stsp option, read
1708 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
1709 0e2f5884 2019-08-07 stsp .Ar response-script
1710 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
1713 4ed9f614 2019-08-04 stsp .Cm got stage
1714 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
1715 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
1716 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
1717 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
1718 4ed9f614 2019-08-04 stsp .Cm got update
1719 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
1720 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
1723 4ed9f614 2019-08-04 stsp .Cm got update ,
1724 4ed9f614 2019-08-04 stsp .Cm got rebase ,
1726 4ed9f614 2019-08-04 stsp .Cm got histedit
1727 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
1728 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
1729 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
1730 4ed9f614 2019-08-04 stsp .Cm got unstage
1731 4ed9f614 2019-08-04 stsp before it can be updated with
1732 4ed9f614 2019-08-04 stsp .Cm got update ,
1733 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
1735 4ed9f614 2019-08-04 stsp Short alias for
1736 4ed9f614 2019-08-04 stsp .Cm stage .
1737 dfc23429 2019-08-11 stsp .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
1738 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
1739 4ed9f614 2019-08-04 stsp back into non-staged status.
1742 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
1743 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
1745 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1746 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
1747 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
1748 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
1749 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
1750 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
1751 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
1752 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1755 2e1f37b0 2019-08-08 stsp The options for
1756 2e1f37b0 2019-08-08 stsp .Cm got unstage
1757 2e1f37b0 2019-08-08 stsp are as follows:
1758 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
1760 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
1761 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
1763 2e1f37b0 2019-08-08 stsp (unstage change),
1765 2e1f37b0 2019-08-08 stsp (keep change staged), and
1767 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
1768 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
1769 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
1770 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
1771 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
1774 2e1f37b0 2019-08-08 stsp option, read
1779 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
1780 2e1f37b0 2019-08-08 stsp .Ar response-script
1781 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
1784 4ed9f614 2019-08-04 stsp Short alias for
1785 4ed9f614 2019-08-04 stsp .Cm unstage .
1786 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 ...
1787 896e9b6f 2019-08-26 stsp Parse and print contents of objects to standard output in a line-based
1788 896e9b6f 2019-08-26 stsp text format.
1789 896e9b6f 2019-08-26 stsp Content of commit, tree, and tag objects is printed in a way similar
1790 896e9b6f 2019-08-26 stsp to the actual content stored in such objects.
1791 896e9b6f 2019-08-26 stsp Blob object contents are printed as they would appear in files on disk.
1793 896e9b6f 2019-08-26 stsp Attempt to interpret each argument as a reference, a tag name, or
1794 896e9b6f 2019-08-26 stsp an object ID SHA1 hash.
1795 01073a5d 2019-08-22 stsp References will be resolved to an object ID.
1796 01073a5d 2019-08-22 stsp Tag names will resolved to a tag object.
1797 01073a5d 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1798 01073a5d 2019-08-22 stsp automatically, provided the abbreviation is unique.
1800 896e9b6f 2019-08-26 stsp If none of the above interpretations produce a valid result, or if the
1802 896e9b6f 2019-08-26 stsp option is used, attempt to interpret the argument as a path which will
1803 896e9b6f 2019-08-26 stsp be resolved to the ID of an object found at this path in the repository.
1805 01073a5d 2019-08-22 stsp The options for
1806 01073a5d 2019-08-22 stsp .Cm got cat
1807 01073a5d 2019-08-22 stsp are as follows:
1808 01073a5d 2019-08-22 stsp .Bl -tag -width Ds
1809 896e9b6f 2019-08-26 stsp .It Fl c Ar commit
1810 896e9b6f 2019-08-26 stsp Look up paths in the specified
1811 896e9b6f 2019-08-26 stsp .Ar commit .
1812 896e9b6f 2019-08-26 stsp If this option is not used, paths are looked up in the commit resolved
1813 896e9b6f 2019-08-26 stsp via the repository's HEAD reference.
1814 896e9b6f 2019-08-26 stsp The expected argument is a commit ID SHA1 hash or an existing reference
1815 896e9b6f 2019-08-26 stsp or tag name which will be resolved to a commit ID.
1816 896e9b6f 2019-08-26 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1817 896e9b6f 2019-08-26 stsp automatically, provided the abbreviation is unique.
1818 01073a5d 2019-08-22 stsp .It Fl r Ar repository-path
1819 01073a5d 2019-08-22 stsp Use the repository at the specified path.
1820 01073a5d 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1821 01073a5d 2019-08-22 stsp working directory.
1822 01073a5d 2019-08-22 stsp If this directory is a
1824 01073a5d 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1826 896e9b6f 2019-08-26 stsp Interpret all arguments as paths only.
1827 896e9b6f 2019-08-26 stsp This option can be used to resolve ambiguity in cases where paths
1828 896e9b6f 2019-08-26 stsp look like tag names, reference names, or object IDs.
1831 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
1832 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
1833 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
1834 74416c47 2019-05-09 stsp The author's name and email address for
1835 21a44f98 2019-07-15 stsp .Cm got commit
1837 21a44f98 2019-07-15 stsp .Cm got import ,
1838 74416c47 2019-05-09 stsp for example:
1839 aba9c984 2019-09-08 stsp .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
1842 84792843 2019-08-09 stsp may fail to parse commits without an email address in author data,
1844 84792843 2019-08-09 stsp attempts to reject
1845 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
1846 84792843 2019-08-09 stsp environment variables with a missing email address.
1848 c9956ddf 2019-09-08 stsp If present, Git's
1849 aba9c984 2019-09-08 stsp .Dv user.name
1851 709ae9eb 2019-09-08 stsp .Dv user.email
1852 709ae9eb 2019-09-08 stsp configuration settings in the repository's
1853 aba9c984 2019-09-08 stsp .Pa .git/config
1854 aba9c984 2019-09-08 stsp file will override the value of
1855 aba9c984 2019-09-08 stsp .Ev GOT_AUTHOR .
1856 c9956ddf 2019-09-08 stsp However, the
1857 c9956ddf 2019-09-08 stsp .Dv user.name
1859 c9956ddf 2019-09-08 stsp .Dv user.email
1860 c9956ddf 2019-09-08 stsp configuration settings contained in Git's global
1861 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1862 c9956ddf 2019-09-08 stsp configuration file will be used only if the
1863 c9956ddf 2019-09-08 stsp .Ev GOT_AUTHOR
1864 c9956ddf 2019-09-08 stsp environment variable is
1867 1dd86744 2019-08-12 anthony .It Ev VISUAL , EDITOR
1868 23594da9 2019-05-13 stsp The editor spawned by
1869 8e7bd50a 2019-08-22 stsp .Cm got commit ,
1870 8e7bd50a 2019-08-22 stsp .Cm got import ,
1872 8e7bd50a 2019-08-22 stsp .Cm got tag .
1873 b1ebc001 2019-08-13 stsp .It Ev GOT_LOG_DEFAULT_LIMIT
1874 b1ebc001 2019-08-13 stsp The default limit on the number of commits traversed by
1875 b1ebc001 2019-08-13 stsp .Cm got log .
1876 b1ebc001 2019-08-13 stsp If set to zero, the limit is unbounded.
1877 b1ebc001 2019-08-13 stsp This variable will be silently ignored if it is set to a non-numeric value.
1879 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
1880 5c860e29 2018-03-12 stsp .Ex -std got
1881 97925469 2018-03-17 stsp .Sh EXAMPLES
1882 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
1885 fd039d72 2020-03-18 stsp .Dl $ cd /var/git/
1886 fd039d72 2020-03-18 stsp .Dl $ got clone ssh://git@github.com/openbsd/src.git
1888 fd039d72 2020-03-18 stsp Use of HTTP URLs currently requires
1889 fa6e0e48 2019-05-23 stsp .Xr git 1 :
1891 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
1892 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
1894 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
1896 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
1897 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
1898 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
1900 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
1901 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
1903 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
1905 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
1907 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
1909 e70c17ce 2019-05-22 stsp .Dl $ got status
1910 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
1912 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
1914 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
1916 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
1918 4e759de4 2019-06-26 stsp .Dl $ got branch -l
1920 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
1921 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
1922 d83d9d5c 2019-05-13 stsp which is forked off the
1923 d83d9d5c 2019-05-13 stsp .Dq master
1926 4e759de4 2019-06-26 stsp .Dl $ got branch unified-buffer-cache master
1928 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
1929 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
1930 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
1932 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
1934 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
1935 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
1937 fa6e0e48 2019-05-23 stsp .Dl $ got commit
1939 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
1940 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
1941 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
1943 48c8c60d 2020-01-27 stsp .Dl $ got log -p -l 3
1945 3d0ac559 2020-04-18 stsp As above, but display changes in the order in which
1946 04e9dcf3 2020-04-18 stsp .Xr patch 1
1947 04e9dcf3 2020-04-18 stsp could apply them in sequence:
1949 04e9dcf3 2020-04-18 stsp .Dl $ got log -p -l 3 -R
1951 5b666081 2020-02-24 stsp In a work tree or a git repository directory, log the history of a subdirectory:
1953 5b666081 2020-02-24 stsp .Dl $ got log sys/uvm
1955 5b666081 2020-02-24 stsp While operating inside a work tree, paths are specified relative to the current
1956 5b666081 2020-02-24 stsp working directory, so this command will log the subdirectory
1957 5b666081 2020-02-24 stsp .Pa sys/uvm :
1959 5b666081 2020-02-24 stsp .Dl $ cd sys/uvm && got log '.'
1961 5b666081 2020-02-24 stsp And this command has the same effect:
1963 5b666081 2020-02-24 stsp .Dl $ cd sys/dev/usb && got log ../../uvm
1965 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
1967 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
1968 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
1970 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
1971 e70c17ce 2019-05-22 stsp with a pre-defined log message.
1973 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
1975 bcbc2272 2020-05-20 stsp Alternatively, create a new commit from local changes in a work tree
1976 bcbc2272 2020-05-20 stsp directory with a log message that has been prepared in the file
1977 bcbc2272 2020-05-20 stsp .Pa /tmp/msg .
1980 bcbc2272 2020-05-20 stsp is set as the
1981 bcbc2272 2020-05-20 stsp .Ev EDITOR ,
1982 bcbc2272 2020-05-20 stsp .Pa /tmp/msg
1983 bcbc2272 2020-05-20 stsp can be read into the buffer for review:
1985 bcbc2272 2020-05-20 stsp .Dl $ got commit
1986 bcbc2272 2020-05-20 stsp .Dl :r /tmp/msg
1988 95fc3404 2019-07-15 stsp Update any work tree checked out from the
1989 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
1990 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
1992 95fc3404 2019-07-15 stsp .Dl $ got update
1994 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
1995 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
1996 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
1998 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1999 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
2000 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
2001 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
2003 469dd726 2020-03-20 stsp Fetch new upstream commits into the local repository's
2004 469dd726 2020-03-20 stsp .Dq origin/master
2007 469dd726 2020-03-20 stsp .Dl $ cd /usr/src
2008 469dd726 2020-03-20 stsp .Dl $ got fetch
2010 469dd726 2020-03-20 stsp In a repository created with a HTTP URL and
2011 469dd726 2020-03-20 stsp .Cm git clone --bare
2013 469dd726 2020-03-20 stsp .Xr git-fetch 1
2014 469dd726 2020-03-20 stsp command must be used instead:
2016 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
2017 469dd726 2020-03-20 stsp .Dl $ git fetch origin master:refs/remotes/origin/master
2019 469dd726 2020-03-20 stsp Rebase the local
2020 469dd726 2020-03-20 stsp .Dq master
2021 469dd726 2020-03-20 stsp branch to merge the new changes that are now visible on the
2022 469dd726 2020-03-20 stsp .Dq origin/master
2025 469dd726 2020-03-20 stsp .Dl $ cd /usr/src
2026 469dd726 2020-03-20 stsp .Dl $ got update -b origin/master
2027 469dd726 2020-03-20 stsp .Dl $ got rebase master
2029 fa6e0e48 2019-05-23 stsp Rebase the
2030 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
2031 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
2032 fa6e0e48 2019-05-23 stsp .Dq master
2035 818c7501 2019-07-11 stsp .Dl $ got update -b master
2036 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
2038 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
2039 1dd86744 2019-08-12 anthony The patch can be mailed out for review and applied to
2040 1dd86744 2019-08-12 anthony .Ox Ns 's
2041 1dd86744 2019-08-12 anthony CVS tree:
2043 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
2045 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
2046 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
2049 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
2050 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
2051 0ebf8283 2019-07-24 stsp .Dl $ got histedit
2053 bf390dec 2020-03-20 stsp In order to merge changes committed to the
2054 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2055 bf390dec 2020-03-20 stsp branch back into the
2056 bf390dec 2020-03-20 stsp .Dq master
2057 bf390dec 2020-03-20 stsp branch, the
2058 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2059 bf390dec 2020-03-20 stsp branch must first be rebased onto the
2060 bf390dec 2020-03-20 stsp .Dq master
2063 bf390dec 2020-03-20 stsp .Dl $ got update -b master
2064 bf390dec 2020-03-20 stsp .Dl $ got rebase unified-buffer-cache
2066 bf390dec 2020-03-20 stsp Changes on the
2067 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2068 bf390dec 2020-03-20 stsp branch can now be made visible on the
2069 bf390dec 2020-03-20 stsp .Dq master
2070 bf390dec 2020-03-20 stsp branch with
2071 bf390dec 2020-03-20 stsp .Cm got integrate .
2072 bf390dec 2020-03-20 stsp Because the rebase operation switched the work tree to the
2073 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2074 bf390dec 2020-03-20 stsp branch, the work tree must be switched back to the
2075 bf390dec 2020-03-20 stsp .Dq master
2076 bf390dec 2020-03-20 stsp branch before the
2077 bf390dec 2020-03-20 stsp .Dq unified-buffer-cache
2078 bf390dec 2020-03-20 stsp branch can be integrated into
2079 bf390dec 2020-03-20 stsp .Dq master :
2081 bf390dec 2020-03-20 stsp .Dl $ got update -b master
2082 bf390dec 2020-03-20 stsp .Dl $ got integrate unified-buffer-cache
2084 469dd726 2020-03-20 stsp Additional steps may be necessary if local changes need to be pushed back
2085 7b3fde24 2019-07-28 stsp to the remote repository, which currently requires
2086 7b3fde24 2019-07-28 stsp .Cm git push .
2087 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
2088 469dd726 2020-03-20 stsp .Cm git clone --bare
2089 7848a0e1 2020-03-19 stsp instead of
2090 7848a0e1 2020-03-19 stsp .Cm got clone ,
2092 ff2cf171 2019-07-28 stsp .Dq refspec
2093 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
2095 ff2cf171 2019-07-28 stsp .Dq refs/remotes
2096 ff2cf171 2019-07-28 stsp namespace of the local repository.
2097 ff2cf171 2019-07-28 stsp This can achieved by setting Git's
2098 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
2099 ff2cf171 2019-07-28 stsp configuration variable to the value
2100 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
2102 ff2cf171 2019-07-28 stsp .Cm git config
2105 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2106 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
2108 469dd726 2020-03-20 stsp Additionally, the
2109 469dd726 2020-03-20 stsp .Dq mirror
2110 469dd726 2020-03-20 stsp option must be disabled:
2112 469dd726 2020-03-20 stsp .Dl $ cd /var/git/repo
2113 469dd726 2020-03-20 stsp .Dl $ git config remote.origin.mirror false
2115 ff2cf171 2019-07-28 stsp Alternatively, the following
2116 469dd726 2020-03-20 stsp .Xr git-fetch 1
2117 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
2118 ff2cf171 2019-07-28 stsp .Pa config
2121 ff2cf171 2019-07-28 stsp .Dl [remote "origin"]
2122 ff2cf171 2019-07-28 stsp .Dl url = ...
2123 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
2124 469dd726 2020-03-20 stsp .Dl mirror = false
2126 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
2127 ff2cf171 2019-07-28 stsp .Dq refs/heads
2128 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
2129 ff2cf171 2019-07-28 stsp .Cm got checkout
2130 ff2cf171 2019-07-28 stsp and, if needed, created with
2131 ff2cf171 2019-07-28 stsp .Cm got branch .
2133 ff2cf171 2019-07-28 stsp Branches in the
2134 ff2cf171 2019-07-28 stsp .Dq remotes/origin
2135 469dd726 2020-03-20 stsp namespace can now be updated with incoming changes from the remote
2136 ff2cf171 2019-07-28 stsp repository with
2137 469dd726 2020-03-20 stsp .Cm got fetch
2139 469dd726 2020-03-20 stsp .Xr git-fetch 1
2140 469dd726 2020-03-20 stsp without extra command line arguments:
2142 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2143 469dd726 2020-03-20 stsp .Dl $ git fetch
2145 7b0db533 2020-02-04 stsp To make changes fetched from the remote repository appear on the
2146 ff2cf171 2019-07-28 stsp .Dq master
2147 7b0db533 2020-02-04 stsp branch, the
2148 ff2cf171 2019-07-28 stsp .Dq master
2149 ff2cf171 2019-07-28 stsp branch must be rebased onto the
2150 ff2cf171 2019-07-28 stsp .Dq origin/master
2152 7b0db533 2020-02-04 stsp This will also merge local changes, if any, with the incoming changes:
2154 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
2155 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
2158 083957f4 2020-02-24 stsp .Dq master
2159 083957f4 2020-02-24 stsp branch, log messages for local changes can now be amended with
2161 083957f4 2020-02-24 stsp by other developers and any other important new information:
2163 083957f4 2020-02-24 stsp .Dl $ got update -c origin/master
2164 083957f4 2020-02-24 stsp .Dl $ got histedit -m
2166 7b0db533 2020-02-04 stsp Local changes on the
2167 ff2cf171 2019-07-28 stsp .Dq master
2168 ff2cf171 2019-07-28 stsp branch can then be pushed to the remote
2169 ff2cf171 2019-07-28 stsp repository with
2170 ff2cf171 2019-07-28 stsp .Cm git push :
2172 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
2173 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
2174 5c860e29 2018-03-12 stsp .Sh SEE ALSO
2175 2312fc47 2019-07-15 stsp .Xr tog 1 ,
2176 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
2177 285dc8a4 2018-03-13 stsp .Xr got-worktree 5
2178 1a208aaf 2018-04-01 stsp .Sh AUTHORS
2179 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
2180 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
2181 bc3056e3 2019-08-18 stsp .An Joshua Stein Aq Mt jcs@openbsd.org
2182 83b416ed 2020-03-18 stsp .An Ori Bernstein Aq Mt ori@openbsd.org
2183 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
2185 fa6e0e48 2019-05-23 stsp is a work-in-progress and many commands remain to be implemented.
2186 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
2188 ff2cf171 2019-07-28 stsp to perform many tasks, in particular tasks related to repository
2189 ff2cf171 2019-07-28 stsp administration and tasks which require a network connection.
