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 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
140 0bb8a95e 2018-03-12 stsp Copy files from a repository into a new work tree.
141 bb51a5b4 2020-01-13 stsp Show the status of each affected file, using the following status codes:
142 bb51a5b4 2020-01-13 stsp .Bl -column YXZ description
143 bb51a5b4 2020-01-13 stsp .It A Ta new file was added
144 bb51a5b4 2020-01-13 stsp .It E Ta file already exists in work tree's meta-data
148 5d7c1dab 2018-04-01 stsp .Ar work tree path
149 c844a238 2019-02-06 stsp is not specified, either use the last component of
150 5d7c1dab 2018-04-01 stsp .Ar repository path ,
152 5d7c1dab 2018-04-01 stsp .Ar path prefix
153 c844a238 2019-02-06 stsp was specified use the last component of
154 5d7c1dab 2018-04-01 stsp .Ar path prefix .
156 38e11793 2018-06-13 stsp The options for
157 38e11793 2018-06-13 stsp .Cm got checkout
158 38e11793 2018-06-13 stsp are as follows:
159 38e11793 2018-06-13 stsp .Bl -tag -width Ds
161 bb51a5b4 2020-01-13 stsp Proceed with the checkout operation even if the directory at
162 bb51a5b4 2020-01-13 stsp .Ar work-tree-path
163 bb51a5b4 2020-01-13 stsp is not empty.
164 bb51a5b4 2020-01-13 stsp Existing files will be left intact.
165 08573d5b 2019-05-14 stsp .It Fl b Ar branch
166 3c575567 2019-07-28 stsp Check out files from a commit on the specified
167 08573d5b 2019-05-14 stsp .Ar branch .
168 08573d5b 2019-05-14 stsp If this option is not specified, a branch resolved via the repository's HEAD
169 08573d5b 2019-05-14 stsp reference will be used.
170 8069f636 2019-01-12 stsp .It Fl c Ar commit
171 8069f636 2019-01-12 stsp Check out files from the specified
173 3c575567 2019-07-28 stsp on the selected branch.
174 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
175 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
176 0e1b0230 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
177 0e1b0230 2019-07-07 stsp automatically, provided the abbreviation is unique.
178 08573d5b 2019-05-14 stsp If this option is not specified, the most recent commit on the selected
179 08573d5b 2019-05-14 stsp branch will be used.
181 4b6c9460 2020-03-05 stsp If the specified
183 4b6c9460 2020-03-05 stsp is not contained in the selected branch, a different branch which contains
184 4b6c9460 2020-03-05 stsp this commit must be specified with the
187 4b6c9460 2020-03-05 stsp If no such branch is known a new branch must be created for this
188 4b6c9460 2020-03-05 stsp commit with
189 4b6c9460 2020-03-05 stsp .Cm got branch
191 4b6c9460 2020-03-05 stsp .Cm got checkout
192 4b6c9460 2020-03-05 stsp can be used.
193 4b6c9460 2020-03-05 stsp Checking out work trees with an unknown branch is intentionally not supported.
194 38e11793 2018-06-13 stsp .It Fl p Ar path-prefix
195 38e11793 2018-06-13 stsp Restrict the work tree to a subset of the repository's tree hierarchy.
196 38e11793 2018-06-13 stsp Only files beneath the specified
197 38e11793 2018-06-13 stsp .Ar path-prefix
198 38e11793 2018-06-13 stsp will be checked out.
201 97b3a7be 2019-07-09 stsp Short alias for
202 97b3a7be 2019-07-09 stsp .Cm checkout .
203 fd039d72 2020-03-18 stsp .It Cm clone Ar repository-URL Op Ar target-directory
204 fd039d72 2020-03-18 stsp Clone a Git repository at the specified
205 fd039d72 2020-03-18 stsp .Ar repository-URL
206 fd039d72 2020-03-18 stsp into the specified
207 fd039d72 2020-03-18 stsp .Ar target-directory .
209 fd039d72 2020-03-18 stsp .Ar target-directory
210 fd039d72 2020-03-18 stsp is specified the directory name will be derived from the name of the
211 fd039d72 2020-03-18 stsp cloned repository.
212 fd039d72 2020-03-18 stsp .Cm got clone
213 fd039d72 2020-03-18 stsp will refuse to run if the
214 fd039d72 2020-03-18 stsp .Ar target-directory
215 fd039d72 2020-03-18 stsp already exists.
218 fd039d72 2020-03-18 stsp .Ar repository-URL
219 fd039d72 2020-03-18 stsp specifies a protocol scheme, a server hostname, and a path to the repository
220 fd039d72 2020-03-18 stsp on the server:
221 fd039d72 2020-03-18 stsp .Lk scheme://hostname/path/to/repository
223 fd039d72 2020-03-18 stsp The following protocol schemes are supported:
224 fd039d72 2020-03-18 stsp .Bl -tag -width git+ssh
226 fd039d72 2020-03-18 stsp The Git protocol as implemented by the
227 fd039d72 2020-03-18 stsp .Xr git-daemon 1
229 fd039d72 2020-03-18 stsp This protocol is discouraged since it supports neither authentication nor
230 fd039d72 2020-03-18 stsp encryption.
231 fd039d72 2020-03-18 stsp .It git+ssh
232 fd039d72 2020-03-18 stsp The Git protocol wrapped in an authenticated and encrypted
235 fd039d72 2020-03-18 stsp With this protocol the hostname may contain an embedded username for
238 fd039d72 2020-03-18 stsp .Mt user@hostname
240 fd039d72 2020-03-18 stsp Short alias for git+ssh.
242 dfc23429 2019-08-11 stsp .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Op Ar path ...
243 024e9686 2019-05-14 stsp Update an existing work tree to a different commit.
244 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
245 7f838b36 2019-02-08 stsp .Bl -column YXZ description
246 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
247 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
248 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
249 7f838b36 2019-02-08 stsp .It D Ta file was deleted
250 7f838b36 2019-02-08 stsp .It A Ta new file was added
251 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
252 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
257 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
258 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
259 f2ea84fa 2019-07-27 stsp specified paths.
260 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
261 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
262 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
265 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
266 c4cdcb68 2019-04-03 stsp multiple base commits.
267 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
268 47ec7be7 2019-05-12 stsp .Cm got update
269 47ec7be7 2019-05-12 stsp across the entire work tree.
270 024e9686 2019-05-14 stsp Specifying a
272 024e9686 2019-05-14 stsp is incompatible with the
276 4ed9f614 2019-08-04 stsp .Cm got update
277 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
278 4ed9f614 2019-08-04 stsp If changes have been staged with
279 4ed9f614 2019-08-04 stsp .Cm got stage ,
280 bc3056e3 2019-08-18 stsp these changes must first be committed with
281 4ed9f614 2019-08-04 stsp .Cm got commit
282 4ed9f614 2019-08-04 stsp or unstaged with
283 4ed9f614 2019-08-04 stsp .Cm got unstage .
285 507dc3bb 2018-12-29 stsp The options for
286 507dc3bb 2018-12-29 stsp .Cm got update
287 507dc3bb 2018-12-29 stsp are as follows:
288 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
289 024e9686 2019-05-14 stsp .It Fl b Ar branch
290 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
292 024e9686 2019-05-14 stsp before updating the work tree.
293 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
294 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
295 507dc3bb 2018-12-29 stsp Update the work tree to the specified
296 507dc3bb 2018-12-29 stsp .Ar commit .
297 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
298 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
299 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
300 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
301 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
302 024e9686 2019-05-14 stsp branch will be used.
305 97b3a7be 2019-07-09 stsp Short alias for
306 97b3a7be 2019-07-09 stsp .Cm update .
307 dfc23429 2019-08-11 stsp .It Cm status Op Ar path ...
308 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
309 6bad629b 2019-02-04 stsp using the following status codes:
310 6bad629b 2019-02-04 stsp .Bl -column YXZ description
311 6bad629b 2019-02-04 stsp .It M Ta modified file
312 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
313 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
314 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
315 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
316 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
317 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
319 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
320 2a06fe5f 2019-08-24 stsp .It N Ta non-existent
322 2a06fe5f 2019-08-24 stsp specified on the command line
327 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
328 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
330 4ed9f614 2019-08-04 stsp If changes have been staged with
331 4ed9f614 2019-08-04 stsp .Cm got stage ,
332 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
333 4ed9f614 2019-08-04 stsp status codes:
334 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
335 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
336 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
337 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
340 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
341 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
342 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
343 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
346 6841da00 2019-08-08 stsp For compatibility with
349 bd8de430 2019-10-04 stsp .Xr git 1 ,
350 6841da00 2019-08-08 stsp .Cm got status
353 bd8de430 2019-10-04 stsp patterns from
354 6841da00 2019-08-08 stsp .Pa .cvsignore
356 bd8de430 2019-10-04 stsp .Pa .gitignore
357 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
358 bd8de430 2019-10-04 stsp which match these patterns.
359 bd8de430 2019-10-04 stsp As an extension to
361 bd8de430 2019-10-04 stsp matching rules,
362 bd8de430 2019-10-04 stsp .Cm got status
363 bd8de430 2019-10-04 stsp supports consecutive asterisks,
365 bd8de430 2019-10-04 stsp which will match an arbitrary amount of directories.
367 6841da00 2019-08-08 stsp .Xr cvs 1 ,
368 6841da00 2019-08-08 stsp .Cm got status
369 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
371 bd8de430 2019-10-04 stsp .Xr git 1 ,
372 bd8de430 2019-10-04 stsp .Cm got status
373 bd8de430 2019-10-04 stsp does not support negated ignore patterns prefixed with
375 bd8de430 2019-10-04 stsp and gives no special significance to the location of path component separators,
377 bd8de430 2019-10-04 stsp in a pattern.
379 97b3a7be 2019-07-09 stsp Short alias for
380 97b3a7be 2019-07-09 stsp .Cm status .
381 48c8c60d 2020-01-27 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 s Ar search-pattern Oc Oo Fl r Ar repository-path Oc Op Ar path
382 38e11793 2018-06-13 stsp Display history of a repository.
385 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
386 dc990cbf 2020-02-22 stsp If invoked in a work tree, the
388 dc990cbf 2020-02-22 stsp is interpreted relative to the current working directory,
389 dc990cbf 2020-02-22 stsp and the work tree's path prefix is implicitly prepended.
390 dc990cbf 2020-02-22 stsp Otherwise, the path is interpreted relative to the repository root.
392 38e11793 2018-06-13 stsp The options for
393 38e11793 2018-06-13 stsp .Cm got log
394 38e11793 2018-06-13 stsp are as follows:
395 38e11793 2018-06-13 stsp .Bl -tag -width Ds
397 1137e0ae 2020-01-27 stsp Display individual commits which were merged into the current branch
398 1137e0ae 2020-01-27 stsp from other branches.
399 48c8c60d 2020-01-27 stsp By default,
400 48c8c60d 2020-01-27 stsp .Cm got log
401 48c8c60d 2020-01-27 stsp shows the linear history of the current branch only.
402 38e11793 2018-06-13 stsp .It Fl c Ar commit
403 38e11793 2018-06-13 stsp Start traversing history at the specified
404 38e11793 2018-06-13 stsp .Ar commit .
405 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
406 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
407 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
408 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
409 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
410 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
411 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
412 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
414 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
415 6238ee32 2018-06-13 stsp .It Fl l Ar N
416 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
417 b1ebc001 2019-08-13 stsp If this option is not specified, a default limit value of zero is used,
418 b1ebc001 2019-08-13 stsp which is treated as an unbounded limit.
420 b1ebc001 2019-08-13 stsp .Ev GOT_LOG_DEFAULT_LIMIT
421 b1ebc001 2019-08-13 stsp environment variable may be set to change this default value.
423 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
426 44392932 2019-08-25 stsp is specified, only show the patch of modifications at or within this path.
427 c6390436 2019-11-29 kn .It Fl s Ar search-pattern
428 c6390436 2019-11-29 kn If specified, show only commits with a log message matched by the extended
429 6841bf13 2019-11-29 kn regular expression
430 6841bf13 2019-11-29 kn .Ar search-pattern .
431 6841bf13 2019-11-29 kn Regular expression syntax is documented in
432 6841bf13 2019-11-29 kn .Xr re_format 7 .
433 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
434 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
435 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
436 04ca23f4 2018-07-16 stsp working directory.
437 e9cf2e30 2019-02-05 stsp If this directory is a
439 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
441 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
442 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
443 927df6b7 2019-02-10 stsp uncommitted changes in the work tree.
446 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
448 d24820bf 2019-08-11 stsp If two arguments are provided, treat each argument as a reference, a tag
449 d24820bf 2019-08-11 stsp name, or an object ID SHA1 hash, and display differences between the
450 d24820bf 2019-08-11 stsp corresponding objects.
451 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
452 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
453 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
455 c0cc5c62 2018-10-18 stsp The options for
456 c0cc5c62 2018-10-18 stsp .Cm got diff
457 c0cc5c62 2018-10-18 stsp are as follows:
458 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
459 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
460 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
461 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
462 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
463 b72f483a 2019-02-05 stsp Use the repository at the specified path.
464 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
465 b72f483a 2019-02-05 stsp working directory.
466 b72f483a 2019-02-05 stsp If this directory is a
468 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
470 4ed9f614 2019-08-04 stsp Show changes staged with
471 4ed9f614 2019-08-04 stsp .Cm got stage
472 4ed9f614 2019-08-04 stsp instead of showing local changes.
473 4ed9f614 2019-08-04 stsp This option is only valid when
474 4ed9f614 2019-08-04 stsp .Cm got diff
475 4ed9f614 2019-08-04 stsp is invoked in a work tree.
477 63035f9f 2019-10-06 stsp Ignore whitespace-only changes.
480 bc26cce8 2019-08-04 stsp Short alias for
482 dfc23429 2019-08-11 stsp .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
483 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
485 1ff8e573 2018-08-02 stsp The options for
486 1ff8e573 2018-08-02 stsp .Cm got blame
487 1ff8e573 2018-08-02 stsp are as follows:
488 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
489 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
490 1ff8e573 2018-08-02 stsp Start traversing history at the specified
491 1ff8e573 2018-08-02 stsp .Ar commit .
492 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
493 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
494 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
495 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
496 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
497 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
498 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
499 1ff8e573 2018-08-02 stsp working directory.
500 0c06baac 2019-02-05 stsp If this directory is a
502 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
505 bc26cce8 2019-08-04 stsp Short alias for
506 bc26cce8 2019-08-04 stsp .Cm blame .
507 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
508 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
509 5de5890b 2018-10-18 stsp directory path in the repository.
510 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
511 db0c2996 2019-02-10 stsp annotations:
512 db0c2996 2019-02-10 stsp .Bl -column YXZ description
513 848d6979 2019-08-12 stsp .It @ Ta entry is a symbolic link
514 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
515 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
516 63c5ca5d 2019-08-24 stsp .It $ Ta entry is a Git submodule
521 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
522 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
523 0c849583 2019-02-05 stsp if there is no work tree.
525 5de5890b 2018-10-18 stsp The options for
526 5de5890b 2018-10-18 stsp .Cm got tree
527 5de5890b 2018-10-18 stsp are as follows:
528 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
529 5de5890b 2018-10-18 stsp .It Fl c Ar commit
530 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
531 5de5890b 2018-10-18 stsp .Ar commit .
532 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
533 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
534 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
535 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
536 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
537 5de5890b 2018-10-18 stsp Use the repository at the specified path.
538 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
539 5de5890b 2018-10-18 stsp working directory.
540 0c849583 2019-02-05 stsp If this directory is a
542 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
544 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
546 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
549 bc26cce8 2019-08-04 stsp Short alias for
551 c55aa27e 2019-08-12 stsp .It Cm ref Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl d Ar name Oc Oo Fl s Oc Op Ar name Ar target
552 d0eebce4 2019-03-11 stsp Manage references in a repository.
554 d0eebce4 2019-03-11 stsp If no options are passed, expect two arguments and attempt to create,
555 d0eebce4 2019-03-11 stsp or update, the reference with the given
557 d0eebce4 2019-03-11 stsp and make it point at the given
558 d83d9d5c 2019-05-13 stsp .Ar target .
559 f16e4044 2019-10-09 stsp The name must be an absolute reference name, i.e. it must begin with
560 f16e4044 2019-10-09 stsp .Dq refs/ .
561 a54b6686 2019-06-28 stsp The target may be an object ID SHA1 hash or an existing reference which
562 a54b6686 2019-06-28 stsp will be resolved to an object ID.
563 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
564 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
566 d0eebce4 2019-03-11 stsp The options for
567 d0eebce4 2019-03-11 stsp .Cm got ref
568 d0eebce4 2019-03-11 stsp are as follows:
569 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
570 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
571 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
572 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
573 d0eebce4 2019-03-11 stsp working directory.
574 d0eebce4 2019-03-11 stsp If this directory is a
576 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
578 d0eebce4 2019-03-11 stsp List all existing references in the repository.
579 d0eebce4 2019-03-11 stsp .It Fl d Ar name
580 d0eebce4 2019-03-11 stsp Delete the reference with the specified name from the repository.
582 d1c1ae5f 2019-08-12 stsp Create a symbolic reference pointing at the specified
583 d1c1ae5f 2019-08-12 stsp .Ar target ,
584 d1c1ae5f 2019-08-12 stsp which must be an existing reference.
585 d1c1ae5f 2019-08-12 stsp Care should be taken not to create loops between references when
586 d1c1ae5f 2019-08-12 stsp this option is used.
588 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
589 da76fce2 2020-02-24 stsp Create, list, or delete branches.
591 4e759de4 2019-06-26 stsp Branches are managed via references which live in the
592 4e759de4 2019-06-26 stsp .Dq refs/heads/
593 4e759de4 2019-06-26 stsp reference namespace.
595 4e759de4 2019-06-26 stsp .Cm got branch
596 4e759de4 2019-06-26 stsp command operates on references in this namespace only.
598 ad89fa31 2019-10-04 stsp If invoked in a work tree without any arguments, print the name of the
599 ad89fa31 2019-10-04 stsp work tree's current branch.
603 a74f7e83 2019-11-10 stsp argument is passed, attempt to create a branch reference with the given name.
604 a74f7e83 2019-11-10 stsp By default the new branch reference will point at the latest commit on the
605 a74f7e83 2019-11-10 stsp work tree's current branch if invoked in a work tree, and otherwise to a commit
606 a74f7e83 2019-11-10 stsp resolved via the repository's HEAD reference.
608 da76fce2 2020-02-24 stsp If invoked in a work tree, once the branch was created successfully
609 da76fce2 2020-02-24 stsp switch the work tree's head reference to the newly created branch and
610 da76fce2 2020-02-24 stsp update files across the entire work tree, just like
611 da76fce2 2020-02-24 stsp .Cm got update -b Ar name
613 da76fce2 2020-02-24 stsp Show the status of each affected file, using the following status codes:
614 da76fce2 2020-02-24 stsp .Bl -column YXZ description
615 da76fce2 2020-02-24 stsp .It U Ta file was updated and contained no local changes
616 da76fce2 2020-02-24 stsp .It G Ta file was updated and local changes were merged cleanly
617 da76fce2 2020-02-24 stsp .It C Ta file was updated and conflicts occurred during merge
618 da76fce2 2020-02-24 stsp .It D Ta file was deleted
619 da76fce2 2020-02-24 stsp .It A Ta new file was added
620 da76fce2 2020-02-24 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
621 da76fce2 2020-02-24 stsp .It ! Ta a missing versioned file was restored
624 4e759de4 2019-06-26 stsp The options for
625 4e759de4 2019-06-26 stsp .Cm got branch
626 4e759de4 2019-06-26 stsp are as follows:
627 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
628 a74f7e83 2019-11-10 stsp .It Fl c Ar commit
629 a74f7e83 2019-11-10 stsp Make a newly created branch reference point at the specified
630 a74f7e83 2019-11-10 stsp .Ar commit .
631 a74f7e83 2019-11-10 stsp The expected
633 a74f7e83 2019-11-10 stsp argument is a commit ID SHA1 hash or an existing reference
634 a74f7e83 2019-11-10 stsp or tag name which will be resolved to a commit ID.
635 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
636 4e759de4 2019-06-26 stsp Use the repository at the specified path.
637 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
638 4e759de4 2019-06-26 stsp working directory.
639 4e759de4 2019-06-26 stsp If this directory is a
641 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
643 4e759de4 2019-06-26 stsp List all existing branches in the repository.
644 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
645 ba882ee3 2019-07-11 stsp with one the following annotations:
646 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
647 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
648 1dd86744 2019-08-12 anthony .It \(a~ Ta work tree's base commit is out-of-date
650 4e759de4 2019-06-26 stsp .It Fl d Ar name
651 4e759de4 2019-06-26 stsp Delete the branch with the specified name from the repository.
652 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
653 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
654 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
655 ce33d90e 2019-07-14 stsp Git's garbage collector.
657 da76fce2 2020-02-24 stsp Do not switch and update the work tree after creating a new branch.
660 97b3a7be 2019-07-09 stsp Short alias for
661 97b3a7be 2019-07-09 stsp .Cm branch .
662 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
663 8e7bd50a 2019-08-22 stsp Manage tags in a repository.
665 8e7bd50a 2019-08-22 stsp Tags are managed via references which live in the
666 8e7bd50a 2019-08-22 stsp .Dq refs/tags/
667 8e7bd50a 2019-08-22 stsp reference namespace.
669 8e7bd50a 2019-08-22 stsp .Cm got tag
670 8e7bd50a 2019-08-22 stsp command operates on references in this namespace only.
671 b3cd068e 2019-08-22 stsp References in this namespace point at tag objects which contain a pointer
672 b3cd068e 2019-08-22 stsp to another object, a tag message, as well as author and timestamp information.
674 80106605 2020-02-24 stsp Attempt to create a tag with the given
676 8e7bd50a 2019-08-22 stsp and make this tag point at the given
677 8e7bd50a 2019-08-22 stsp .Ar commit .
678 8e7bd50a 2019-08-22 stsp If no commit is specified, default to the latest commit on the work tree's
679 8e7bd50a 2019-08-22 stsp current branch if invoked in a work tree, and to a commit resolved via
680 8e7bd50a 2019-08-22 stsp the repository's HEAD reference otherwise.
682 8e7bd50a 2019-08-22 stsp The options for
683 8e7bd50a 2019-08-22 stsp .Cm got tag
684 8e7bd50a 2019-08-22 stsp are as follows:
685 8e7bd50a 2019-08-22 stsp .Bl -tag -width Ds
686 80106605 2020-02-24 stsp .It Fl c Ar commit
687 80106605 2020-02-24 stsp Make the newly created tag reference point at the specified
688 80106605 2020-02-24 stsp .Ar commit .
689 80106605 2020-02-24 stsp The expected
691 80106605 2020-02-24 stsp argument is a commit ID SHA1 hash or an existing reference or tag name which
692 80106605 2020-02-24 stsp will be resolved to a commit ID.
693 80106605 2020-02-24 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
694 80106605 2020-02-24 stsp automatically, provided the abbreviation is unique.
695 8e7bd50a 2019-08-22 stsp .It Fl m Ar message
696 80106605 2020-02-24 stsp Use the specified tag message when creating the new tag.
697 8e7bd50a 2019-08-22 stsp Without the
700 3a62228f 2019-11-08 stsp .Cm got tag
701 8e7bd50a 2019-08-22 stsp opens a temporary file in an editor where a tag message can be written.
702 8e7bd50a 2019-08-22 stsp .It Fl r Ar repository-path
703 8e7bd50a 2019-08-22 stsp Use the repository at the specified path.
704 8e7bd50a 2019-08-22 stsp If not specified, assume the repository is located at or above the current
705 8e7bd50a 2019-08-22 stsp working directory.
706 8e7bd50a 2019-08-22 stsp If this directory is a
708 8e7bd50a 2019-08-22 stsp work tree, use the repository path associated with this work tree.
710 8e7bd50a 2019-08-22 stsp List all existing tags in the repository instead of creating a new tag.
711 8e7bd50a 2019-08-22 stsp If this option is used, no other command-line arguments are allowed.
714 8e7bd50a 2019-08-22 stsp By design, the
715 8e7bd50a 2019-08-22 stsp .Cm got tag
716 8e7bd50a 2019-08-22 stsp command will not delete tags or change existing tags.
717 8e7bd50a 2019-08-22 stsp If a tag must be deleted, the
718 8e7bd50a 2019-08-22 stsp .Cm got ref
719 8e7bd50a 2019-08-22 stsp command may be used to delete a tag's reference.
720 8e7bd50a 2019-08-22 stsp This should only be done if the tag has not already been copied to
721 8e7bd50a 2019-08-22 stsp another repository.
722 022fae89 2019-12-06 tracey .It Cm add Oo Fl R Oc Oo Fl I Oc Ar path ...
723 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
724 d00136be 2019-03-26 stsp repository in the next commit.
726 4e68cba3 2019-11-23 stsp The options for
727 4e68cba3 2019-11-23 stsp .Cm got add
728 4e68cba3 2019-11-23 stsp are as follows:
729 4e68cba3 2019-11-23 stsp .Bl -tag -width Ds
731 4e68cba3 2019-11-23 stsp Permit recursion into directories.
732 4e68cba3 2019-11-23 stsp If this option is not specified,
733 4e68cba3 2019-11-23 stsp .Cm got add
734 4e68cba3 2019-11-23 stsp will refuse to run if a specified
736 4e68cba3 2019-11-23 stsp is a directory.
738 022fae89 2019-12-06 tracey With -R, add files even if they match a
739 022fae89 2019-12-06 tracey .Cm got status
740 022fae89 2019-12-06 tracey ignore pattern.
742 c29c428a 2019-12-16 stsp .It Cm remove Oo Fl f Oc Oo Fl k Oc Oo Fl R Oc Ar path ...
743 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
744 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
746 2ec1f75b 2019-03-26 stsp The options for
747 86d25a1b 2019-07-11 stsp .Cm got remove
748 2ec1f75b 2019-03-26 stsp are as follows:
749 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
751 17ed4618 2019-06-02 stsp Perform the operation even if a file contains uncommitted modifications.
753 70e3e7f5 2019-12-13 tracey Keep affected files on disk.
755 f2a9dc41 2019-12-13 tracey Permit recursion into directories.
756 f2a9dc41 2019-12-13 tracey If this option is not specified,
757 f2a9dc41 2019-12-13 tracey .Cm got remove
758 f2a9dc41 2019-12-13 tracey will refuse to run if a specified
760 f2a9dc41 2019-12-13 tracey is a directory.
763 648e4ef7 2019-07-09 stsp Short alias for
764 648e4ef7 2019-07-09 stsp .Cm remove .
765 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 ...
766 bc3056e3 2019-08-18 stsp Revert any uncommitted changes in files at the specified paths.
767 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
768 1dd86744 2019-08-12 anthony work tree's base commit.
769 1dd86744 2019-08-12 anthony There is no way to bring discarded changes back after
770 a129376b 2019-03-28 stsp .Cm got revert !
772 e20a8b6f 2019-06-04 stsp If a file was added with
773 a129376b 2019-03-28 stsp .Cm got add
774 a129376b 2019-03-28 stsp it will become an unversioned file again.
775 e20a8b6f 2019-06-04 stsp If a file was deleted with
776 86d25a1b 2019-07-11 stsp .Cm got remove
777 a129376b 2019-03-28 stsp it will be restored.
779 0f6d7415 2019-08-08 stsp The options for
780 0f6d7415 2019-08-08 stsp .Cm got revert
781 0f6d7415 2019-08-08 stsp are as follows:
782 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
784 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
785 33aa809d 2019-08-08 stsp changes to revert based on
787 33aa809d 2019-08-08 stsp (revert change),
789 33aa809d 2019-08-08 stsp (keep change), and
791 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
792 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
793 33aa809d 2019-08-08 stsp modified file content can be reverted.
794 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
795 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
798 33aa809d 2019-08-08 stsp option, read
803 33aa809d 2019-08-08 stsp responses line-by-line from the specified
804 33aa809d 2019-08-08 stsp .Ar response-script
805 33aa809d 2019-08-08 stsp file instead of prompting interactively.
807 0f6d7415 2019-08-08 stsp Permit recursion into directories.
808 0f6d7415 2019-08-08 stsp If this option is not specified,
809 0f6d7415 2019-08-08 stsp .Cm got revert
810 0f6d7415 2019-08-08 stsp will refuse to run if a specified
812 0f6d7415 2019-08-08 stsp is a directory.
815 97b3a7be 2019-07-09 stsp Short alias for
816 97b3a7be 2019-07-09 stsp .Cm revert .
817 dfc23429 2019-08-11 stsp .It Cm commit Oo Fl m Ar message Oc Op Ar path ...
818 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
819 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
822 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
823 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
825 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
826 1dd86744 2019-08-12 anthony .Cm got stage ,
827 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
828 4ed9f614 2019-08-04 stsp have not been staged.
830 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
831 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
832 15cd91f7 2019-05-12 stsp .It M Ta modified file
833 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
834 15cd91f7 2019-05-12 stsp .It A Ta new file was added
835 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
838 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
839 996d5ccd 2019-08-05 stsp recorded base commit.
842 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
843 15cd91f7 2019-05-12 stsp multiple base commits.
844 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
845 47ec7be7 2019-05-12 stsp .Cm got update
846 47ec7be7 2019-05-12 stsp across the entire work tree.
849 15cd91f7 2019-05-12 stsp .Cm got commit
850 15cd91f7 2019-05-12 stsp command requires the
851 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
852 aba9c984 2019-09-08 stsp environment variable to be set,
853 aba9c984 2019-09-08 stsp unless Git's
854 aba9c984 2019-09-08 stsp .Dv user.name
856 709ae9eb 2019-09-08 stsp .Dv user.email
857 709ae9eb 2019-09-08 stsp configuration settings can be
858 aba9c984 2019-09-08 stsp obtained from the repository's
859 aba9c984 2019-09-08 stsp .Pa .git/config
860 c9956ddf 2019-09-08 stsp file or from Git's global
861 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
862 c9956ddf 2019-09-08 stsp configuration file.
864 74416c47 2019-05-09 stsp The options for
865 74416c47 2019-05-09 stsp .Cm got commit
866 74416c47 2019-05-09 stsp are as follows:
867 74416c47 2019-05-09 stsp .Bl -tag -width Ds
868 74ff3f23 2019-07-07 stsp .It Fl m Ar message
869 74416c47 2019-05-09 stsp Use the specified log message when creating the new commit.
870 23594da9 2019-05-13 stsp Without the
873 23594da9 2019-05-13 stsp .Cm got commit
874 23594da9 2019-05-13 stsp opens a temporary file in an editor where a log message can be written.
877 cfce0458 2019-07-28 stsp .Cm got commit
878 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
879 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
880 916f288c 2019-07-30 stsp .Dq refs/heads/
881 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
882 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
883 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
884 cfce0458 2019-07-28 stsp If a path is found to be out of date,
885 cfce0458 2019-07-28 stsp .Cm got update
886 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
887 cfce0458 2019-07-28 stsp in the repository.
889 97b3a7be 2019-07-09 stsp Short alias for
890 97b3a7be 2019-07-09 stsp .Cm commit .
891 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
892 234035bc 2019-06-01 stsp Merge changes from a single
894 234035bc 2019-06-01 stsp into the work tree.
895 234035bc 2019-06-01 stsp The specified
897 234035bc 2019-06-01 stsp must be on a different branch than the work tree's base commit.
898 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
899 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
900 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
902 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
903 234035bc 2019-06-01 stsp .Bl -column YXZ description
904 234035bc 2019-06-01 stsp .It G Ta file was merged
905 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
906 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
907 234035bc 2019-06-01 stsp .It D Ta file was deleted
908 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
909 234035bc 2019-06-01 stsp .It A Ta new file was added
910 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
913 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
914 234035bc 2019-06-01 stsp may be viewed with
915 234035bc 2019-06-01 stsp .Cm got diff ,
916 234035bc 2019-06-01 stsp amended manually or with further
917 234035bc 2019-06-01 stsp .Cm got cherrypick
919 234035bc 2019-06-01 stsp committed with
920 234035bc 2019-06-01 stsp .Cm got commit ,
921 234035bc 2019-06-01 stsp or discarded again with
922 234035bc 2019-06-01 stsp .Cm got revert .
924 234035bc 2019-06-01 stsp .Cm got cherrypick
925 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
926 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
927 234035bc 2019-06-01 stsp to a single base commit with
928 234035bc 2019-06-01 stsp .Cm got update .
929 234035bc 2019-06-01 stsp If the work tree already contains files with merge conflicts, these
930 234035bc 2019-06-01 stsp conflicts must be resolved first.
932 97b3a7be 2019-07-09 stsp Short alias for
933 97b3a7be 2019-07-09 stsp .Cm cherrypick .
934 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
935 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
937 5ef14e63 2019-06-02 stsp into the work tree.
938 5ef14e63 2019-06-02 stsp The specified
940 5ef14e63 2019-06-02 stsp must be on the same branch as the work tree's base commit.
941 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
942 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
943 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
945 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
946 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
947 5ef14e63 2019-06-02 stsp .It G Ta file was merged
948 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
949 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
950 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
951 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
952 5ef14e63 2019-06-02 stsp .It A Ta new file was added
953 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
956 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
957 5ef14e63 2019-06-02 stsp which may be viewed with
958 5ef14e63 2019-06-02 stsp .Cm got diff ,
959 5ef14e63 2019-06-02 stsp amended manually or with further
960 778a73c2 2019-07-12 stsp .Cm got backout
962 5ef14e63 2019-06-02 stsp committed with
963 5ef14e63 2019-06-02 stsp .Cm got commit ,
964 5ef14e63 2019-06-02 stsp or discarded again with
965 5ef14e63 2019-06-02 stsp .Cm got revert .
967 92228c38 2019-06-02 stsp .Cm got backout
968 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
969 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
970 92228c38 2019-06-02 stsp to a single base commit with
971 92228c38 2019-06-02 stsp .Cm got update .
972 92228c38 2019-06-02 stsp If the work tree already contains files with merge conflicts, these
973 92228c38 2019-06-02 stsp conflicts must be resolved first.
975 97b3a7be 2019-07-09 stsp Short alias for
976 97b3a7be 2019-07-09 stsp .Cm backout .
977 dfc23429 2019-08-11 stsp .It Cm rebase Oo Fl a Oc Oo Fl c Oc Op Ar branch
978 818c7501 2019-07-11 stsp Rebase commits on the specified
980 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
983 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
984 bc3056e3 2019-08-18 stsp Rebasing begins with the first descendant commit of the youngest
985 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
987 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
988 f09e2405 2019-07-11 stsp of the specified
990 f09e2405 2019-07-11 stsp has been rebased.
993 2b6826ba 2020-02-24 stsp .Cm got rebase
994 2b6826ba 2020-02-24 stsp is used as intended, the specified
996 c10890ce 2020-02-25 stsp represents a local commit history and may already contain changes
997 c10890ce 2020-02-25 stsp that are not yet visible in any other repositories.
998 2b6826ba 2020-02-24 stsp The work tree's current branch, which must be set with
999 2b6826ba 2020-02-24 stsp .Cm got update -b
1000 2b6826ba 2020-02-24 stsp before starting the
1001 2b6826ba 2020-02-24 stsp .Cm rebase
1002 2b6826ba 2020-02-24 stsp operation, represents a branch from a remote repository which shares
1003 2b6826ba 2020-02-24 stsp a common history with the specified
1004 2b6826ba 2020-02-24 stsp .Ar branch
1005 c10890ce 2020-02-25 stsp but has progressed, and perhaps diverged, due to commits added to the
1006 c10890ce 2020-02-25 stsp remote repository.
1008 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
1009 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
1010 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
1011 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
1012 818c7501 2019-07-11 stsp .Ar branch ,
1013 818c7501 2019-07-11 stsp but with different commit IDs.
1014 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
1015 f09e2405 2019-07-11 stsp the new version of the specified
1016 818c7501 2019-07-11 stsp .Ar branch
1017 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
1019 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
1020 818c7501 2019-07-11 stsp using the following status codes:
1021 818c7501 2019-07-11 stsp .Bl -column YXZ description
1022 818c7501 2019-07-11 stsp .It G Ta file was merged
1023 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
1024 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
1025 818c7501 2019-07-11 stsp .It D Ta file was deleted
1026 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
1027 818c7501 2019-07-11 stsp .It A Ta new file was added
1028 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1031 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
1032 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
1033 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
1034 818c7501 2019-07-11 stsp .Ar branch
1035 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
1037 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
1038 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
1039 f09e2405 2019-07-11 stsp when the rebase operation continues.
1041 818c7501 2019-07-11 stsp .Cm got rebase
1042 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
1043 a85446b2 2020-01-04 stsp If the work tree is not yet fully updated to the tip commit of its
1044 a85446b2 2020-01-04 stsp branch then the work tree must first be updated with
1045 818c7501 2019-07-11 stsp .Cm got update .
1046 4ed9f614 2019-08-04 stsp If changes have been staged with
1047 4ed9f614 2019-08-04 stsp .Cm got stage ,
1048 bc3056e3 2019-08-18 stsp these changes must first be committed with
1049 4ed9f614 2019-08-04 stsp .Cm got commit
1050 4ed9f614 2019-08-04 stsp or unstaged with
1051 4ed9f614 2019-08-04 stsp .Cm got unstage .
1052 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
1053 f09e2405 2019-07-11 stsp committed with
1054 f09e2405 2019-07-11 stsp .Cm got commit
1055 f09e2405 2019-07-11 stsp or reverted with
1056 f09e2405 2019-07-11 stsp .Cm got revert .
1058 64c6d990 2019-07-11 stsp .Ar branch
1059 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
1060 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
1063 7d5807f4 2019-07-11 stsp .Cm got update
1065 7d5807f4 2019-07-11 stsp .Cm got commit
1066 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
1067 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
1068 7d5807f4 2019-07-11 stsp conflict resolution purposes.
1070 818c7501 2019-07-11 stsp The options for
1071 818c7501 2019-07-11 stsp .Cm got rebase
1072 818c7501 2019-07-11 stsp are as follows:
1073 818c7501 2019-07-11 stsp .Bl -tag -width Ds
1075 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
1076 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1078 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
1079 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1082 818c7501 2019-07-11 stsp Short alias for
1083 818c7501 2019-07-11 stsp .Cm rebase .
1084 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
1085 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
1086 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
1088 6e54d307 2020-02-24 stsp Before starting a
1089 6e54d307 2020-02-24 stsp .Cm histedit
1090 6e54d307 2020-02-24 stsp operation the work tree's current branch must be set with
1091 6e54d307 2020-02-24 stsp .Cm got update -b
1092 6e54d307 2020-02-24 stsp to the branch which should be edited, unless this branch is already the
1093 6e54d307 2020-02-24 stsp current branch of the work tree.
1094 6e54d307 2020-02-24 stsp The tip of this branch represents the upper bound (inclusive) of commits
1095 6e54d307 2020-02-24 stsp touched by the
1096 6e54d307 2020-02-24 stsp .Cm histedit
1097 6e54d307 2020-02-24 stsp operation.
1099 6e54d307 2020-02-24 stsp Furthermore, the work tree's base commit
1100 6e54d307 2020-02-24 stsp must be set with
1101 6e54d307 2020-02-24 stsp .Cm got update -c
1102 6e54d307 2020-02-24 stsp to a point in this branch's commit history where editing should begin.
1103 6e54d307 2020-02-24 stsp This commit represents the lower bound (non-inclusive) of commits touched
1105 6e54d307 2020-02-24 stsp .Cm histedit
1106 6e54d307 2020-02-24 stsp operation.
1108 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
1109 0ebf8283 2019-07-24 stsp .Ar histedit script
1110 46fa4c83 2020-02-24 stsp which can be written in an editor based on a template, passed on the
1111 46fa4c83 2020-02-24 stsp command line, or generated with the
1113 083957f4 2020-02-24 stsp option if only log messages need to be edited.
1115 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
1116 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
1117 0ebf8283 2019-07-24 stsp whitespace and an argument.
1118 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
1119 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
1120 0ebf8283 2019-07-24 stsp Lines which begin with the
1122 0ebf8283 2019-07-24 stsp character are ignored entirely.
1124 0ebf8283 2019-07-24 stsp The available commands are as follows:
1125 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
1126 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
1127 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
1128 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
1129 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
1130 0ebf8283 2019-07-24 stsp listed further below that will be used.
1131 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
1132 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
1133 0ebf8283 2019-07-24 stsp the commit on the previous line.
1134 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
1135 0ebf8283 2019-07-24 stsp log message can be written.
1138 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
1139 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
1140 5b87815e 2020-03-05 stsp No commit may be listed more than once.
1142 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
1143 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
1144 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
1145 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
1146 498a90b7 2019-07-25 stsp switched to it.
1148 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
1149 0ebf8283 2019-07-24 stsp using the following status codes:
1150 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
1151 0ebf8283 2019-07-24 stsp .It G Ta file was merged
1152 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
1153 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
1154 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
1155 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
1156 0ebf8283 2019-07-24 stsp .It A Ta new file was added
1157 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1160 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
1161 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
1162 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
1163 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
1165 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
1166 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
1167 0ebf8283 2019-07-24 stsp when the histedit operation continues.
1169 0ebf8283 2019-07-24 stsp .Cm got histedit
1170 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
1171 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
1172 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
1173 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
1174 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
1175 0ebf8283 2019-07-24 stsp to a single base commit with
1176 0ebf8283 2019-07-24 stsp .Cm got update .
1177 4ed9f614 2019-08-04 stsp If changes have been staged with
1178 4ed9f614 2019-08-04 stsp .Cm got stage ,
1179 bc3056e3 2019-08-18 stsp these changes must first be committed with
1180 4ed9f614 2019-08-04 stsp .Cm got commit
1181 4ed9f614 2019-08-04 stsp or unstaged with
1182 4ed9f614 2019-08-04 stsp .Cm got unstage .
1183 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
1184 0ebf8283 2019-07-24 stsp committed with
1185 0ebf8283 2019-07-24 stsp .Cm got commit
1186 0ebf8283 2019-07-24 stsp or reverted with
1187 0ebf8283 2019-07-24 stsp .Cm got revert .
1188 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
1189 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
1192 7ef62c4e 2020-02-24 stsp .Cm got update ,
1193 7ef62c4e 2020-02-24 stsp .Cm got rebase ,
1195 65db4ffb 2020-02-24 stsp .Cm got integrate
1196 65db4ffb 2020-02-24 stsp commands will refuse to run while a histedit operation is in progress.
1197 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
1198 0ebf8283 2019-07-24 stsp .Cm got commit
1199 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
1200 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
1202 0ebf8283 2019-07-24 stsp The options for
1203 0ebf8283 2019-07-24 stsp .Cm got histedit
1204 0ebf8283 2019-07-24 stsp are as follows:
1205 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
1207 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
1208 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1210 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
1211 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1212 ddbfac99 2020-02-24 stsp .It Fl F Ar histedit-script
1213 ddbfac99 2020-02-24 stsp Use the specified
1214 ddbfac99 2020-02-24 stsp .Ar histedit-script
1215 ddbfac99 2020-02-24 stsp instead of opening a temporary file in an editor where a histedit script
1216 ddbfac99 2020-02-24 stsp can be written.
1218 083957f4 2020-02-24 stsp Edit log messages only.
1219 083957f4 2020-02-24 stsp This option is a quick equivalent to a histedit script which edits
1220 2bdefe56 2020-02-24 tracey only log messages but otherwise leaves every picked commit as-is.
1223 083957f4 2020-02-24 stsp option can only be used when starting a new histedit operation.
1224 083957f4 2020-02-24 stsp If this option is used, no other command-line arguments are allowed.
1227 0ebf8283 2019-07-24 stsp Short alias for
1228 0ebf8283 2019-07-24 stsp .Cm histedit .
1229 2822a352 2019-10-15 stsp .It Cm integrate Ar branch
1230 2822a352 2019-10-15 stsp Integrate the specified
1231 2822a352 2019-10-15 stsp .Ar branch
1232 2822a352 2019-10-15 stsp into the work tree's current branch.
1233 2822a352 2019-10-15 stsp Files in the work tree are updated to match the contents on the integrated
1234 2822a352 2019-10-15 stsp .Ar branch ,
1235 2822a352 2019-10-15 stsp and the reference of the work tree's branch is changed to point at the
1236 2822a352 2019-10-15 stsp head commit of the integrated
1237 2822a352 2019-10-15 stsp .Ar branch .
1239 2822a352 2019-10-15 stsp Both branches can be considered equivalent after integration since they
1240 2822a352 2019-10-15 stsp will be pointing at the same commit.
1241 2822a352 2019-10-15 stsp Both branches remain available for future work, if desired.
1242 2822a352 2019-10-15 stsp In case the integrated
1243 2822a352 2019-10-15 stsp .Ar branch
1244 2822a352 2019-10-15 stsp is no longer needed it may be deleted with
1245 2822a352 2019-10-15 stsp .Cm got branch -d .
1247 2822a352 2019-10-15 stsp Show the status of each affected file, using the following status codes:
1248 2822a352 2019-10-15 stsp .Bl -column YXZ description
1249 2822a352 2019-10-15 stsp .It U Ta file was updated
1250 2822a352 2019-10-15 stsp .It D Ta file was deleted
1251 2822a352 2019-10-15 stsp .It A Ta new file was added
1252 2822a352 2019-10-15 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
1253 2822a352 2019-10-15 stsp .It ! Ta a missing versioned file was restored
1256 2822a352 2019-10-15 stsp .Cm got integrate
1257 2822a352 2019-10-15 stsp will refuse to run if certain preconditions are not met.
1258 2822a352 2019-10-15 stsp Most importantly, the
1259 2822a352 2019-10-15 stsp .Ar branch
1260 2822a352 2019-10-15 stsp must have been rebased onto the work tree's current branch with
1261 2822a352 2019-10-15 stsp .Cm got rebase
1262 2822a352 2019-10-15 stsp before it can be integrated, in order to linearize commit history and
1263 2822a352 2019-10-15 stsp resolve merge conflicts.
1264 2822a352 2019-10-15 stsp If the work tree contains multiple base commits it must first be updated
1265 2822a352 2019-10-15 stsp to a single base commit with
1266 2822a352 2019-10-15 stsp .Cm got update .
1267 2822a352 2019-10-15 stsp If changes have been staged with
1268 2822a352 2019-10-15 stsp .Cm got stage ,
1269 2822a352 2019-10-15 stsp these changes must first be committed with
1270 2822a352 2019-10-15 stsp .Cm got commit
1271 2822a352 2019-10-15 stsp or unstaged with
1272 2822a352 2019-10-15 stsp .Cm got unstage .
1273 2822a352 2019-10-15 stsp If the work tree contains local changes, these changes must first be
1274 2822a352 2019-10-15 stsp committed with
1275 2822a352 2019-10-15 stsp .Cm got commit
1276 2822a352 2019-10-15 stsp or reverted with
1277 2822a352 2019-10-15 stsp .Cm got revert .
1279 2822a352 2019-10-15 stsp Short alias for
1280 2822a352 2019-10-15 stsp .Cm integrate .
1281 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 ...
1282 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
1285 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
1286 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
1287 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
1288 4ed9f614 2019-08-04 stsp .Cm got status .
1290 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1291 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
1292 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
1293 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
1294 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
1297 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
1298 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
1299 9d8b19a4 2019-08-04 stsp committed.
1301 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
1302 4ed9f614 2019-08-04 stsp .Cm got commit ,
1303 4ed9f614 2019-08-04 stsp .Cm got status ,
1305 4ed9f614 2019-08-04 stsp .Cm got diff .
1306 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
1307 4ed9f614 2019-08-04 stsp .Cm got commit
1308 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
1309 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
1310 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
1312 4ed9f614 2019-08-04 stsp .Cm got status
1313 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
1315 4ed9f614 2019-08-04 stsp .Cm got diff
1316 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
1317 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
1319 4ed9f614 2019-08-04 stsp .Cm got revert
1320 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
1321 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
1323 4ed9f614 2019-08-04 stsp The options for
1324 4ed9f614 2019-08-04 stsp .Cm got stage
1325 4ed9f614 2019-08-04 stsp are as follows:
1326 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
1328 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
1329 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
1330 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
1331 1dd86744 2019-08-12 anthony among the specified paths.
1332 1dd86744 2019-08-12 anthony Otherwise, show all staged paths.
1334 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
1335 dc424a06 2019-08-07 stsp select or reject changes for staging based on
1337 6d23ec10 2019-08-08 stsp (stage change),
1339 6d23ec10 2019-08-08 stsp (reject change), and
1341 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
1342 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
1343 dc424a06 2019-08-07 stsp modified file content can be staged.
1344 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
1345 6d23ec10 2019-08-08 stsp their entirety.
1346 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
1349 3a070a2b 2019-08-07 stsp option, read
1354 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
1355 0e2f5884 2019-08-07 stsp .Ar response-script
1356 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
1359 4ed9f614 2019-08-04 stsp .Cm got stage
1360 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
1361 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
1362 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
1363 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
1364 4ed9f614 2019-08-04 stsp .Cm got update
1365 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
1366 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
1369 4ed9f614 2019-08-04 stsp .Cm got update ,
1370 4ed9f614 2019-08-04 stsp .Cm got rebase ,
1372 4ed9f614 2019-08-04 stsp .Cm got histedit
1373 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
1374 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
1375 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
1376 4ed9f614 2019-08-04 stsp .Cm got unstage
1377 4ed9f614 2019-08-04 stsp before it can be updated with
1378 4ed9f614 2019-08-04 stsp .Cm got update ,
1379 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
1381 4ed9f614 2019-08-04 stsp Short alias for
1382 4ed9f614 2019-08-04 stsp .Cm stage .
1383 dfc23429 2019-08-11 stsp .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
1384 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
1385 4ed9f614 2019-08-04 stsp back into non-staged status.
1388 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
1389 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
1391 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1392 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
1393 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
1394 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
1395 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
1396 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
1397 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
1398 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1401 2e1f37b0 2019-08-08 stsp The options for
1402 2e1f37b0 2019-08-08 stsp .Cm got unstage
1403 2e1f37b0 2019-08-08 stsp are as follows:
1404 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
1406 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
1407 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
1409 2e1f37b0 2019-08-08 stsp (unstage change),
1411 2e1f37b0 2019-08-08 stsp (keep change staged), and
1413 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
1414 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
1415 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
1416 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
1417 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
1420 2e1f37b0 2019-08-08 stsp option, read
1425 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
1426 2e1f37b0 2019-08-08 stsp .Ar response-script
1427 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
1430 4ed9f614 2019-08-04 stsp Short alias for
1431 4ed9f614 2019-08-04 stsp .Cm unstage .
1432 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 ...
1433 896e9b6f 2019-08-26 stsp Parse and print contents of objects to standard output in a line-based
1434 896e9b6f 2019-08-26 stsp text format.
1435 896e9b6f 2019-08-26 stsp Content of commit, tree, and tag objects is printed in a way similar
1436 896e9b6f 2019-08-26 stsp to the actual content stored in such objects.
1437 896e9b6f 2019-08-26 stsp Blob object contents are printed as they would appear in files on disk.
1439 896e9b6f 2019-08-26 stsp Attempt to interpret each argument as a reference, a tag name, or
1440 896e9b6f 2019-08-26 stsp an object ID SHA1 hash.
1441 01073a5d 2019-08-22 stsp References will be resolved to an object ID.
1442 01073a5d 2019-08-22 stsp Tag names will resolved to a tag object.
1443 01073a5d 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1444 01073a5d 2019-08-22 stsp automatically, provided the abbreviation is unique.
1446 896e9b6f 2019-08-26 stsp If none of the above interpretations produce a valid result, or if the
1448 896e9b6f 2019-08-26 stsp option is used, attempt to interpret the argument as a path which will
1449 896e9b6f 2019-08-26 stsp be resolved to the ID of an object found at this path in the repository.
1451 01073a5d 2019-08-22 stsp The options for
1452 01073a5d 2019-08-22 stsp .Cm got cat
1453 01073a5d 2019-08-22 stsp are as follows:
1454 01073a5d 2019-08-22 stsp .Bl -tag -width Ds
1455 896e9b6f 2019-08-26 stsp .It Fl c Ar commit
1456 896e9b6f 2019-08-26 stsp Look up paths in the specified
1457 896e9b6f 2019-08-26 stsp .Ar commit .
1458 896e9b6f 2019-08-26 stsp If this option is not used, paths are looked up in the commit resolved
1459 896e9b6f 2019-08-26 stsp via the repository's HEAD reference.
1460 896e9b6f 2019-08-26 stsp The expected argument is a commit ID SHA1 hash or an existing reference
1461 896e9b6f 2019-08-26 stsp or tag name which will be resolved to a commit ID.
1462 896e9b6f 2019-08-26 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1463 896e9b6f 2019-08-26 stsp automatically, provided the abbreviation is unique.
1464 01073a5d 2019-08-22 stsp .It Fl r Ar repository-path
1465 01073a5d 2019-08-22 stsp Use the repository at the specified path.
1466 01073a5d 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1467 01073a5d 2019-08-22 stsp working directory.
1468 01073a5d 2019-08-22 stsp If this directory is a
1470 01073a5d 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1472 896e9b6f 2019-08-26 stsp Interpret all arguments as paths only.
1473 896e9b6f 2019-08-26 stsp This option can be used to resolve ambiguity in cases where paths
1474 896e9b6f 2019-08-26 stsp look like tag names, reference names, or object IDs.
1477 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
1478 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
1479 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
1480 74416c47 2019-05-09 stsp The author's name and email address for
1481 21a44f98 2019-07-15 stsp .Cm got commit
1483 21a44f98 2019-07-15 stsp .Cm got import ,
1484 74416c47 2019-05-09 stsp for example:
1485 aba9c984 2019-09-08 stsp .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
1488 84792843 2019-08-09 stsp may fail to parse commits without an email address in author data,
1490 84792843 2019-08-09 stsp attempts to reject
1491 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
1492 84792843 2019-08-09 stsp environment variables with a missing email address.
1494 c9956ddf 2019-09-08 stsp If present, Git's
1495 aba9c984 2019-09-08 stsp .Dv user.name
1497 709ae9eb 2019-09-08 stsp .Dv user.email
1498 709ae9eb 2019-09-08 stsp configuration settings in the repository's
1499 aba9c984 2019-09-08 stsp .Pa .git/config
1500 aba9c984 2019-09-08 stsp file will override the value of
1501 aba9c984 2019-09-08 stsp .Ev GOT_AUTHOR .
1502 c9956ddf 2019-09-08 stsp However, the
1503 c9956ddf 2019-09-08 stsp .Dv user.name
1505 c9956ddf 2019-09-08 stsp .Dv user.email
1506 c9956ddf 2019-09-08 stsp configuration settings contained in Git's global
1507 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1508 c9956ddf 2019-09-08 stsp configuration file will be used only if the
1509 c9956ddf 2019-09-08 stsp .Ev GOT_AUTHOR
1510 c9956ddf 2019-09-08 stsp environment variable is
1513 1dd86744 2019-08-12 anthony .It Ev VISUAL , EDITOR
1514 23594da9 2019-05-13 stsp The editor spawned by
1515 8e7bd50a 2019-08-22 stsp .Cm got commit ,
1516 8e7bd50a 2019-08-22 stsp .Cm got import ,
1518 8e7bd50a 2019-08-22 stsp .Cm got tag .
1519 b1ebc001 2019-08-13 stsp .It Ev GOT_LOG_DEFAULT_LIMIT
1520 b1ebc001 2019-08-13 stsp The default limit on the number of commits traversed by
1521 b1ebc001 2019-08-13 stsp .Cm got log .
1522 b1ebc001 2019-08-13 stsp If set to zero, the limit is unbounded.
1523 b1ebc001 2019-08-13 stsp This variable will be silently ignored if it is set to a non-numeric value.
1525 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
1526 5c860e29 2018-03-12 stsp .Ex -std got
1527 97925469 2018-03-17 stsp .Sh EXAMPLES
1528 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
1531 fd039d72 2020-03-18 stsp .Dl $ cd /var/git/
1532 fd039d72 2020-03-18 stsp .Dl $ got clone ssh://git@github.com/openbsd/src.git
1534 fd039d72 2020-03-18 stsp Use of HTTP URLs currently requires
1535 fa6e0e48 2019-05-23 stsp .Xr git 1 :
1537 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
1538 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
1540 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
1542 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
1543 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
1544 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
1546 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
1547 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
1549 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
1551 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
1553 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
1555 e70c17ce 2019-05-22 stsp .Dl $ got status
1556 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
1558 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
1560 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
1562 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
1564 4e759de4 2019-06-26 stsp .Dl $ got branch -l
1566 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
1567 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
1568 d83d9d5c 2019-05-13 stsp which is forked off the
1569 d83d9d5c 2019-05-13 stsp .Dq master
1572 4e759de4 2019-06-26 stsp .Dl $ got branch unified-buffer-cache master
1574 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
1575 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
1576 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
1578 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
1580 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
1581 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
1583 fa6e0e48 2019-05-23 stsp .Dl $ got commit
1585 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
1586 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
1587 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
1589 48c8c60d 2020-01-27 stsp .Dl $ got log -p -l 3
1591 5b666081 2020-02-24 stsp In a work tree or a git repository directory, log the history of a subdirectory:
1593 5b666081 2020-02-24 stsp .Dl $ got log sys/uvm
1595 5b666081 2020-02-24 stsp While operating inside a work tree, paths are specified relative to the current
1596 5b666081 2020-02-24 stsp working directory, so this command will log the subdirectory
1597 5b666081 2020-02-24 stsp .Pa sys/uvm :
1599 5b666081 2020-02-24 stsp .Dl $ cd sys/uvm && got log '.'
1601 5b666081 2020-02-24 stsp And this command has the same effect:
1603 5b666081 2020-02-24 stsp .Dl $ cd sys/dev/usb && got log ../../uvm
1605 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
1607 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
1608 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
1610 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
1611 e70c17ce 2019-05-22 stsp with a pre-defined log message.
1613 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
1615 95fc3404 2019-07-15 stsp Update any work tree checked out from the
1616 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
1617 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
1619 95fc3404 2019-07-15 stsp .Dl $ got update
1621 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
1622 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
1623 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
1625 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1626 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
1627 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
1628 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1630 9221fb1e 2019-06-26 stsp Fetch new upstream commits into the local repository's master branch.
1631 9221fb1e 2019-06-26 stsp This step currently requires
1632 9221fb1e 2019-06-26 stsp .Xr git 1 :
1634 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
1635 fa6e0e48 2019-05-23 stsp .Dl $ git fetch origin master:master
1637 fa6e0e48 2019-05-23 stsp Rebase the
1638 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
1639 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
1640 fa6e0e48 2019-05-23 stsp .Dq master
1643 818c7501 2019-07-11 stsp .Dl $ got update -b master
1644 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
1646 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
1647 1dd86744 2019-08-12 anthony The patch can be mailed out for review and applied to
1648 1dd86744 2019-08-12 anthony .Ox Ns 's
1649 1dd86744 2019-08-12 anthony CVS tree:
1651 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
1653 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
1654 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
1657 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
1658 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
1659 0ebf8283 2019-07-24 stsp .Dl $ got histedit
1661 7b3fde24 2019-07-28 stsp Additional steps are necessary if local changes need to be pushed back
1662 7b3fde24 2019-07-28 stsp to the remote repository, which currently requires
1663 7b3fde24 2019-07-28 stsp .Cm git fetch
1665 7b3fde24 2019-07-28 stsp .Cm git push .
1666 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
1667 ff2cf171 2019-07-28 stsp .Dq git clone --bare ,
1669 ff2cf171 2019-07-28 stsp .Dq refspec
1670 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
1672 ff2cf171 2019-07-28 stsp .Dq refs/remotes
1673 ff2cf171 2019-07-28 stsp namespace of the local repository.
1674 ff2cf171 2019-07-28 stsp This can achieved by setting Git's
1675 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
1676 ff2cf171 2019-07-28 stsp configuration variable to the value
1677 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
1679 ff2cf171 2019-07-28 stsp .Cm git config
1682 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1683 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
1685 ff2cf171 2019-07-28 stsp Alternatively, the following
1687 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
1688 ff2cf171 2019-07-28 stsp .Pa config
1691 ff2cf171 2019-07-28 stsp .Dl [remote "origin"]
1692 ff2cf171 2019-07-28 stsp .Dl url = ...
1693 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
1695 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
1696 ff2cf171 2019-07-28 stsp .Dq refs/heads
1697 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
1698 ff2cf171 2019-07-28 stsp .Cm got checkout
1699 ff2cf171 2019-07-28 stsp and, if needed, created with
1700 ff2cf171 2019-07-28 stsp .Cm got branch .
1702 ff2cf171 2019-07-28 stsp Branches in the
1703 ff2cf171 2019-07-28 stsp .Dq remotes/origin
1704 ff2cf171 2019-07-28 stsp namespace can be updated with incoming changes from the remote
1705 ff2cf171 2019-07-28 stsp repository with
1706 ff2cf171 2019-07-28 stsp .Cm git fetch :
1708 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1709 ff2cf171 2019-07-28 stsp .Dl $ git fetch
1711 7b0db533 2020-02-04 stsp To make changes fetched from the remote repository appear on the
1712 ff2cf171 2019-07-28 stsp .Dq master
1713 7b0db533 2020-02-04 stsp branch, the
1714 ff2cf171 2019-07-28 stsp .Dq master
1715 ff2cf171 2019-07-28 stsp branch must be rebased onto the
1716 ff2cf171 2019-07-28 stsp .Dq origin/master
1718 7b0db533 2020-02-04 stsp This will also merge local changes, if any, with the incoming changes:
1720 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
1721 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
1724 083957f4 2020-02-24 stsp .Dq master
1725 083957f4 2020-02-24 stsp branch, log messages for local changes can now be amended with
1727 083957f4 2020-02-24 stsp by other developers and any other important new information:
1729 083957f4 2020-02-24 stsp .Dl $ got update -c origin/master
1730 083957f4 2020-02-24 stsp .Dl $ got histedit -m
1732 7b0db533 2020-02-04 stsp Local changes on the
1733 ff2cf171 2019-07-28 stsp .Dq master
1734 ff2cf171 2019-07-28 stsp branch can then be pushed to the remote
1735 ff2cf171 2019-07-28 stsp repository with
1736 ff2cf171 2019-07-28 stsp .Cm git push :
1738 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1739 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
1741 14c25ea2 2019-10-15 stsp In order to merge changes committed to the
1742 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1743 14c25ea2 2019-10-15 stsp branch back into the
1744 14c25ea2 2019-10-15 stsp .Dq master
1745 14c25ea2 2019-10-15 stsp branch, the
1746 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1747 14c25ea2 2019-10-15 stsp branch must first be rebased onto the
1748 14c25ea2 2019-10-15 stsp .Dq master
1751 14c25ea2 2019-10-15 stsp .Dl $ got update -b master
1752 14c25ea2 2019-10-15 stsp .Dl $ got rebase unified-buffer-cache
1754 14c25ea2 2019-10-15 stsp Changes on the
1755 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1756 14c25ea2 2019-10-15 stsp branch can now be made visible on the
1757 14c25ea2 2019-10-15 stsp .Dq master
1758 14c25ea2 2019-10-15 stsp branch with
1759 14c25ea2 2019-10-15 stsp .Cm got integrate .
1760 14c25ea2 2019-10-15 stsp Because the rebase operation switched the work tree to the
1761 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1762 14c25ea2 2019-10-15 stsp branch, the work tree must be switched back to the
1763 14c25ea2 2019-10-15 stsp .Dq master
1764 14c25ea2 2019-10-15 stsp branch before the
1765 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1766 14c25ea2 2019-10-15 stsp branch can be integrated into
1767 14c25ea2 2019-10-15 stsp .Dq master :
1769 14c25ea2 2019-10-15 stsp .Dl $ got update -b master
1770 14c25ea2 2019-10-15 stsp .Dl $ got integrate unified-buffer-cache
1771 5c860e29 2018-03-12 stsp .Sh SEE ALSO
1772 2312fc47 2019-07-15 stsp .Xr tog 1 ,
1773 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
1774 285dc8a4 2018-03-13 stsp .Xr got-worktree 5
1775 1a208aaf 2018-04-01 stsp .Sh AUTHORS
1776 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
1777 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
1778 bc3056e3 2019-08-18 stsp .An Joshua Stein Aq Mt jcs@openbsd.org
1779 83b416ed 2020-03-18 stsp .An Ori Bernstein Aq Mt ori@openbsd.org
1780 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
1782 fa6e0e48 2019-05-23 stsp is a work-in-progress and many commands remain to be implemented.
1783 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
1785 ff2cf171 2019-07-28 stsp to perform many tasks, in particular tasks related to repository
1786 ff2cf171 2019-07-28 stsp administration and tasks which require a network connection.
