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 dfc23429 2019-08-11 stsp .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Op Ar path ...
204 024e9686 2019-05-14 stsp Update an existing work tree to a different commit.
205 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
206 7f838b36 2019-02-08 stsp .Bl -column YXZ description
207 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
208 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
209 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
210 7f838b36 2019-02-08 stsp .It D Ta file was deleted
211 7f838b36 2019-02-08 stsp .It A Ta new file was added
212 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
213 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
218 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
219 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
220 f2ea84fa 2019-07-27 stsp specified paths.
221 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
222 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
223 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
226 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
227 c4cdcb68 2019-04-03 stsp multiple base commits.
228 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
229 47ec7be7 2019-05-12 stsp .Cm got update
230 47ec7be7 2019-05-12 stsp across the entire work tree.
231 024e9686 2019-05-14 stsp Specifying a
233 024e9686 2019-05-14 stsp is incompatible with the
237 4ed9f614 2019-08-04 stsp .Cm got update
238 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
239 4ed9f614 2019-08-04 stsp If changes have been staged with
240 4ed9f614 2019-08-04 stsp .Cm got stage ,
241 bc3056e3 2019-08-18 stsp these changes must first be committed with
242 4ed9f614 2019-08-04 stsp .Cm got commit
243 4ed9f614 2019-08-04 stsp or unstaged with
244 4ed9f614 2019-08-04 stsp .Cm got unstage .
246 507dc3bb 2018-12-29 stsp The options for
247 507dc3bb 2018-12-29 stsp .Cm got update
248 507dc3bb 2018-12-29 stsp are as follows:
249 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
250 024e9686 2019-05-14 stsp .It Fl b Ar branch
251 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
253 024e9686 2019-05-14 stsp before updating the work tree.
254 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
255 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
256 507dc3bb 2018-12-29 stsp Update the work tree to the specified
257 507dc3bb 2018-12-29 stsp .Ar commit .
258 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
259 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
260 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
261 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
262 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
263 024e9686 2019-05-14 stsp branch will be used.
266 97b3a7be 2019-07-09 stsp Short alias for
267 97b3a7be 2019-07-09 stsp .Cm update .
268 dfc23429 2019-08-11 stsp .It Cm status Op Ar path ...
269 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
270 6bad629b 2019-02-04 stsp using the following status codes:
271 6bad629b 2019-02-04 stsp .Bl -column YXZ description
272 6bad629b 2019-02-04 stsp .It M Ta modified file
273 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
274 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
275 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
276 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
277 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
278 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
280 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
281 2a06fe5f 2019-08-24 stsp .It N Ta non-existent
283 2a06fe5f 2019-08-24 stsp specified on the command line
288 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
289 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
291 4ed9f614 2019-08-04 stsp If changes have been staged with
292 4ed9f614 2019-08-04 stsp .Cm got stage ,
293 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
294 4ed9f614 2019-08-04 stsp status codes:
295 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
296 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
297 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
298 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
301 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
302 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
303 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
304 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
307 6841da00 2019-08-08 stsp For compatibility with
310 bd8de430 2019-10-04 stsp .Xr git 1 ,
311 6841da00 2019-08-08 stsp .Cm got status
314 bd8de430 2019-10-04 stsp patterns from
315 6841da00 2019-08-08 stsp .Pa .cvsignore
317 bd8de430 2019-10-04 stsp .Pa .gitignore
318 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
319 bd8de430 2019-10-04 stsp which match these patterns.
320 bd8de430 2019-10-04 stsp As an extension to
322 bd8de430 2019-10-04 stsp matching rules,
323 bd8de430 2019-10-04 stsp .Cm got status
324 bd8de430 2019-10-04 stsp supports consecutive asterisks,
326 bd8de430 2019-10-04 stsp which will match an arbitrary amount of directories.
328 6841da00 2019-08-08 stsp .Xr cvs 1 ,
329 6841da00 2019-08-08 stsp .Cm got status
330 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
332 bd8de430 2019-10-04 stsp .Xr git 1 ,
333 bd8de430 2019-10-04 stsp .Cm got status
334 bd8de430 2019-10-04 stsp does not support negated ignore patterns prefixed with
336 bd8de430 2019-10-04 stsp and gives no special significance to the location of path component separators,
338 bd8de430 2019-10-04 stsp in a pattern.
340 97b3a7be 2019-07-09 stsp Short alias for
341 97b3a7be 2019-07-09 stsp .Cm status .
342 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
343 38e11793 2018-06-13 stsp Display history of a repository.
346 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
347 dc990cbf 2020-02-22 stsp If invoked in a work tree, the
349 dc990cbf 2020-02-22 stsp is interpreted relative to the current working directory,
350 dc990cbf 2020-02-22 stsp and the work tree's path prefix is implicitly prepended.
351 dc990cbf 2020-02-22 stsp Otherwise, the path is interpreted relative to the repository root.
353 38e11793 2018-06-13 stsp The options for
354 38e11793 2018-06-13 stsp .Cm got log
355 38e11793 2018-06-13 stsp are as follows:
356 38e11793 2018-06-13 stsp .Bl -tag -width Ds
358 1137e0ae 2020-01-27 stsp Display individual commits which were merged into the current branch
359 1137e0ae 2020-01-27 stsp from other branches.
360 48c8c60d 2020-01-27 stsp By default,
361 48c8c60d 2020-01-27 stsp .Cm got log
362 48c8c60d 2020-01-27 stsp shows the linear history of the current branch only.
363 38e11793 2018-06-13 stsp .It Fl c Ar commit
364 38e11793 2018-06-13 stsp Start traversing history at the specified
365 38e11793 2018-06-13 stsp .Ar commit .
366 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
367 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
368 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
369 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
370 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
371 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
372 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
373 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
375 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
376 6238ee32 2018-06-13 stsp .It Fl l Ar N
377 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
378 b1ebc001 2019-08-13 stsp If this option is not specified, a default limit value of zero is used,
379 b1ebc001 2019-08-13 stsp which is treated as an unbounded limit.
381 b1ebc001 2019-08-13 stsp .Ev GOT_LOG_DEFAULT_LIMIT
382 b1ebc001 2019-08-13 stsp environment variable may be set to change this default value.
384 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
387 44392932 2019-08-25 stsp is specified, only show the patch of modifications at or within this path.
388 c6390436 2019-11-29 kn .It Fl s Ar search-pattern
389 c6390436 2019-11-29 kn If specified, show only commits with a log message matched by the extended
390 6841bf13 2019-11-29 kn regular expression
391 6841bf13 2019-11-29 kn .Ar search-pattern .
392 6841bf13 2019-11-29 kn Regular expression syntax is documented in
393 6841bf13 2019-11-29 kn .Xr re_format 7 .
394 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
395 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
396 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
397 04ca23f4 2018-07-16 stsp working directory.
398 e9cf2e30 2019-02-05 stsp If this directory is a
400 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
402 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
403 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
404 927df6b7 2019-02-10 stsp uncommitted changes in the work tree.
407 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
409 d24820bf 2019-08-11 stsp If two arguments are provided, treat each argument as a reference, a tag
410 d24820bf 2019-08-11 stsp name, or an object ID SHA1 hash, and display differences between the
411 d24820bf 2019-08-11 stsp corresponding objects.
412 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
413 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
414 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
416 c0cc5c62 2018-10-18 stsp The options for
417 c0cc5c62 2018-10-18 stsp .Cm got diff
418 c0cc5c62 2018-10-18 stsp are as follows:
419 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
420 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
421 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
422 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
423 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
424 b72f483a 2019-02-05 stsp Use the repository at the specified path.
425 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
426 b72f483a 2019-02-05 stsp working directory.
427 b72f483a 2019-02-05 stsp If this directory is a
429 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
431 4ed9f614 2019-08-04 stsp Show changes staged with
432 4ed9f614 2019-08-04 stsp .Cm got stage
433 4ed9f614 2019-08-04 stsp instead of showing local changes.
434 4ed9f614 2019-08-04 stsp This option is only valid when
435 4ed9f614 2019-08-04 stsp .Cm got diff
436 4ed9f614 2019-08-04 stsp is invoked in a work tree.
438 63035f9f 2019-10-06 stsp Ignore whitespace-only changes.
441 bc26cce8 2019-08-04 stsp Short alias for
443 dfc23429 2019-08-11 stsp .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
444 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
446 1ff8e573 2018-08-02 stsp The options for
447 1ff8e573 2018-08-02 stsp .Cm got blame
448 1ff8e573 2018-08-02 stsp are as follows:
449 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
450 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
451 1ff8e573 2018-08-02 stsp Start traversing history at the specified
452 1ff8e573 2018-08-02 stsp .Ar commit .
453 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
454 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
455 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
456 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
457 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
458 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
459 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
460 1ff8e573 2018-08-02 stsp working directory.
461 0c06baac 2019-02-05 stsp If this directory is a
463 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
466 bc26cce8 2019-08-04 stsp Short alias for
467 bc26cce8 2019-08-04 stsp .Cm blame .
468 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
469 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
470 5de5890b 2018-10-18 stsp directory path in the repository.
471 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
472 db0c2996 2019-02-10 stsp annotations:
473 db0c2996 2019-02-10 stsp .Bl -column YXZ description
474 848d6979 2019-08-12 stsp .It @ Ta entry is a symbolic link
475 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
476 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
477 63c5ca5d 2019-08-24 stsp .It $ Ta entry is a Git submodule
482 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
483 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
484 0c849583 2019-02-05 stsp if there is no work tree.
486 5de5890b 2018-10-18 stsp The options for
487 5de5890b 2018-10-18 stsp .Cm got tree
488 5de5890b 2018-10-18 stsp are as follows:
489 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
490 5de5890b 2018-10-18 stsp .It Fl c Ar commit
491 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
492 5de5890b 2018-10-18 stsp .Ar commit .
493 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
494 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
495 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
496 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
497 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
498 5de5890b 2018-10-18 stsp Use the repository at the specified path.
499 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
500 5de5890b 2018-10-18 stsp working directory.
501 0c849583 2019-02-05 stsp If this directory is a
503 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
505 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
507 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
510 bc26cce8 2019-08-04 stsp Short alias for
512 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
513 d0eebce4 2019-03-11 stsp Manage references in a repository.
515 d0eebce4 2019-03-11 stsp If no options are passed, expect two arguments and attempt to create,
516 d0eebce4 2019-03-11 stsp or update, the reference with the given
518 d0eebce4 2019-03-11 stsp and make it point at the given
519 d83d9d5c 2019-05-13 stsp .Ar target .
520 f16e4044 2019-10-09 stsp The name must be an absolute reference name, i.e. it must begin with
521 f16e4044 2019-10-09 stsp .Dq refs/ .
522 a54b6686 2019-06-28 stsp The target may be an object ID SHA1 hash or an existing reference which
523 a54b6686 2019-06-28 stsp will be resolved to an object ID.
524 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
525 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
527 d0eebce4 2019-03-11 stsp The options for
528 d0eebce4 2019-03-11 stsp .Cm got ref
529 d0eebce4 2019-03-11 stsp are as follows:
530 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
531 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
532 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
533 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
534 d0eebce4 2019-03-11 stsp working directory.
535 d0eebce4 2019-03-11 stsp If this directory is a
537 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
539 d0eebce4 2019-03-11 stsp List all existing references in the repository.
540 d0eebce4 2019-03-11 stsp .It Fl d Ar name
541 d0eebce4 2019-03-11 stsp Delete the reference with the specified name from the repository.
543 d1c1ae5f 2019-08-12 stsp Create a symbolic reference pointing at the specified
544 d1c1ae5f 2019-08-12 stsp .Ar target ,
545 d1c1ae5f 2019-08-12 stsp which must be an existing reference.
546 d1c1ae5f 2019-08-12 stsp Care should be taken not to create loops between references when
547 d1c1ae5f 2019-08-12 stsp this option is used.
549 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
550 da76fce2 2020-02-24 stsp Create, list, or delete branches.
552 4e759de4 2019-06-26 stsp Branches are managed via references which live in the
553 4e759de4 2019-06-26 stsp .Dq refs/heads/
554 4e759de4 2019-06-26 stsp reference namespace.
556 4e759de4 2019-06-26 stsp .Cm got branch
557 4e759de4 2019-06-26 stsp command operates on references in this namespace only.
559 ad89fa31 2019-10-04 stsp If invoked in a work tree without any arguments, print the name of the
560 ad89fa31 2019-10-04 stsp work tree's current branch.
564 a74f7e83 2019-11-10 stsp argument is passed, attempt to create a branch reference with the given name.
565 a74f7e83 2019-11-10 stsp By default the new branch reference will point at the latest commit on the
566 a74f7e83 2019-11-10 stsp work tree's current branch if invoked in a work tree, and otherwise to a commit
567 a74f7e83 2019-11-10 stsp resolved via the repository's HEAD reference.
569 da76fce2 2020-02-24 stsp If invoked in a work tree, once the branch was created successfully
570 da76fce2 2020-02-24 stsp switch the work tree's head reference to the newly created branch and
571 da76fce2 2020-02-24 stsp update files across the entire work tree, just like
572 da76fce2 2020-02-24 stsp .Cm got update -b Ar name
574 da76fce2 2020-02-24 stsp Show the status of each affected file, using the following status codes:
575 da76fce2 2020-02-24 stsp .Bl -column YXZ description
576 da76fce2 2020-02-24 stsp .It U Ta file was updated and contained no local changes
577 da76fce2 2020-02-24 stsp .It G Ta file was updated and local changes were merged cleanly
578 da76fce2 2020-02-24 stsp .It C Ta file was updated and conflicts occurred during merge
579 da76fce2 2020-02-24 stsp .It D Ta file was deleted
580 da76fce2 2020-02-24 stsp .It A Ta new file was added
581 da76fce2 2020-02-24 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
582 da76fce2 2020-02-24 stsp .It ! Ta a missing versioned file was restored
585 4e759de4 2019-06-26 stsp The options for
586 4e759de4 2019-06-26 stsp .Cm got branch
587 4e759de4 2019-06-26 stsp are as follows:
588 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
589 a74f7e83 2019-11-10 stsp .It Fl c Ar commit
590 a74f7e83 2019-11-10 stsp Make a newly created branch reference point at the specified
591 a74f7e83 2019-11-10 stsp .Ar commit .
592 a74f7e83 2019-11-10 stsp The expected
594 a74f7e83 2019-11-10 stsp argument is a commit ID SHA1 hash or an existing reference
595 a74f7e83 2019-11-10 stsp or tag name which will be resolved to a commit ID.
596 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
597 4e759de4 2019-06-26 stsp Use the repository at the specified path.
598 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
599 4e759de4 2019-06-26 stsp working directory.
600 4e759de4 2019-06-26 stsp If this directory is a
602 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
604 4e759de4 2019-06-26 stsp List all existing branches in the repository.
605 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
606 ba882ee3 2019-07-11 stsp with one the following annotations:
607 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
608 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
609 1dd86744 2019-08-12 anthony .It \(a~ Ta work tree's base commit is out-of-date
611 4e759de4 2019-06-26 stsp .It Fl d Ar name
612 4e759de4 2019-06-26 stsp Delete the branch with the specified name from the repository.
613 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
614 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
615 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
616 ce33d90e 2019-07-14 stsp Git's garbage collector.
618 da76fce2 2020-02-24 stsp Do not switch and update the work tree after creating a new branch.
621 97b3a7be 2019-07-09 stsp Short alias for
622 97b3a7be 2019-07-09 stsp .Cm branch .
623 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
624 8e7bd50a 2019-08-22 stsp Manage tags in a repository.
626 8e7bd50a 2019-08-22 stsp Tags are managed via references which live in the
627 8e7bd50a 2019-08-22 stsp .Dq refs/tags/
628 8e7bd50a 2019-08-22 stsp reference namespace.
630 8e7bd50a 2019-08-22 stsp .Cm got tag
631 8e7bd50a 2019-08-22 stsp command operates on references in this namespace only.
632 b3cd068e 2019-08-22 stsp References in this namespace point at tag objects which contain a pointer
633 b3cd068e 2019-08-22 stsp to another object, a tag message, as well as author and timestamp information.
635 80106605 2020-02-24 stsp Attempt to create a tag with the given
637 8e7bd50a 2019-08-22 stsp and make this tag point at the given
638 8e7bd50a 2019-08-22 stsp .Ar commit .
639 8e7bd50a 2019-08-22 stsp If no commit is specified, default to the latest commit on the work tree's
640 8e7bd50a 2019-08-22 stsp current branch if invoked in a work tree, and to a commit resolved via
641 8e7bd50a 2019-08-22 stsp the repository's HEAD reference otherwise.
643 8e7bd50a 2019-08-22 stsp The options for
644 8e7bd50a 2019-08-22 stsp .Cm got tag
645 8e7bd50a 2019-08-22 stsp are as follows:
646 8e7bd50a 2019-08-22 stsp .Bl -tag -width Ds
647 80106605 2020-02-24 stsp .It Fl c Ar commit
648 80106605 2020-02-24 stsp Make the newly created tag reference point at the specified
649 80106605 2020-02-24 stsp .Ar commit .
650 80106605 2020-02-24 stsp The expected
652 80106605 2020-02-24 stsp argument is a commit ID SHA1 hash or an existing reference or tag name which
653 80106605 2020-02-24 stsp will be resolved to a commit ID.
654 80106605 2020-02-24 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
655 80106605 2020-02-24 stsp automatically, provided the abbreviation is unique.
656 8e7bd50a 2019-08-22 stsp .It Fl m Ar message
657 80106605 2020-02-24 stsp Use the specified tag message when creating the new tag.
658 8e7bd50a 2019-08-22 stsp Without the
661 3a62228f 2019-11-08 stsp .Cm got tag
662 8e7bd50a 2019-08-22 stsp opens a temporary file in an editor where a tag message can be written.
663 8e7bd50a 2019-08-22 stsp .It Fl r Ar repository-path
664 8e7bd50a 2019-08-22 stsp Use the repository at the specified path.
665 8e7bd50a 2019-08-22 stsp If not specified, assume the repository is located at or above the current
666 8e7bd50a 2019-08-22 stsp working directory.
667 8e7bd50a 2019-08-22 stsp If this directory is a
669 8e7bd50a 2019-08-22 stsp work tree, use the repository path associated with this work tree.
671 8e7bd50a 2019-08-22 stsp List all existing tags in the repository instead of creating a new tag.
672 8e7bd50a 2019-08-22 stsp If this option is used, no other command-line arguments are allowed.
675 8e7bd50a 2019-08-22 stsp By design, the
676 8e7bd50a 2019-08-22 stsp .Cm got tag
677 8e7bd50a 2019-08-22 stsp command will not delete tags or change existing tags.
678 8e7bd50a 2019-08-22 stsp If a tag must be deleted, the
679 8e7bd50a 2019-08-22 stsp .Cm got ref
680 8e7bd50a 2019-08-22 stsp command may be used to delete a tag's reference.
681 8e7bd50a 2019-08-22 stsp This should only be done if the tag has not already been copied to
682 8e7bd50a 2019-08-22 stsp another repository.
683 022fae89 2019-12-06 tracey .It Cm add Oo Fl R Oc Oo Fl I Oc Ar path ...
684 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
685 d00136be 2019-03-26 stsp repository in the next commit.
687 4e68cba3 2019-11-23 stsp The options for
688 4e68cba3 2019-11-23 stsp .Cm got add
689 4e68cba3 2019-11-23 stsp are as follows:
690 4e68cba3 2019-11-23 stsp .Bl -tag -width Ds
692 4e68cba3 2019-11-23 stsp Permit recursion into directories.
693 4e68cba3 2019-11-23 stsp If this option is not specified,
694 4e68cba3 2019-11-23 stsp .Cm got add
695 4e68cba3 2019-11-23 stsp will refuse to run if a specified
697 4e68cba3 2019-11-23 stsp is a directory.
699 022fae89 2019-12-06 tracey With -R, add files even if they match a
700 022fae89 2019-12-06 tracey .Cm got status
701 022fae89 2019-12-06 tracey ignore pattern.
703 c29c428a 2019-12-16 stsp .It Cm remove Oo Fl f Oc Oo Fl k Oc Oo Fl R Oc Ar path ...
704 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
705 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
707 2ec1f75b 2019-03-26 stsp The options for
708 86d25a1b 2019-07-11 stsp .Cm got remove
709 2ec1f75b 2019-03-26 stsp are as follows:
710 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
712 17ed4618 2019-06-02 stsp Perform the operation even if a file contains uncommitted modifications.
714 70e3e7f5 2019-12-13 tracey Keep affected files on disk.
716 f2a9dc41 2019-12-13 tracey Permit recursion into directories.
717 f2a9dc41 2019-12-13 tracey If this option is not specified,
718 f2a9dc41 2019-12-13 tracey .Cm got remove
719 f2a9dc41 2019-12-13 tracey will refuse to run if a specified
721 f2a9dc41 2019-12-13 tracey is a directory.
724 648e4ef7 2019-07-09 stsp Short alias for
725 648e4ef7 2019-07-09 stsp .Cm remove .
726 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 ...
727 bc3056e3 2019-08-18 stsp Revert any uncommitted changes in files at the specified paths.
728 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
729 1dd86744 2019-08-12 anthony work tree's base commit.
730 1dd86744 2019-08-12 anthony There is no way to bring discarded changes back after
731 a129376b 2019-03-28 stsp .Cm got revert !
733 e20a8b6f 2019-06-04 stsp If a file was added with
734 a129376b 2019-03-28 stsp .Cm got add
735 a129376b 2019-03-28 stsp it will become an unversioned file again.
736 e20a8b6f 2019-06-04 stsp If a file was deleted with
737 86d25a1b 2019-07-11 stsp .Cm got remove
738 a129376b 2019-03-28 stsp it will be restored.
740 0f6d7415 2019-08-08 stsp The options for
741 0f6d7415 2019-08-08 stsp .Cm got revert
742 0f6d7415 2019-08-08 stsp are as follows:
743 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
745 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
746 33aa809d 2019-08-08 stsp changes to revert based on
748 33aa809d 2019-08-08 stsp (revert change),
750 33aa809d 2019-08-08 stsp (keep change), and
752 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
753 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
754 33aa809d 2019-08-08 stsp modified file content can be reverted.
755 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
756 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
759 33aa809d 2019-08-08 stsp option, read
764 33aa809d 2019-08-08 stsp responses line-by-line from the specified
765 33aa809d 2019-08-08 stsp .Ar response-script
766 33aa809d 2019-08-08 stsp file instead of prompting interactively.
768 0f6d7415 2019-08-08 stsp Permit recursion into directories.
769 0f6d7415 2019-08-08 stsp If this option is not specified,
770 0f6d7415 2019-08-08 stsp .Cm got revert
771 0f6d7415 2019-08-08 stsp will refuse to run if a specified
773 0f6d7415 2019-08-08 stsp is a directory.
776 97b3a7be 2019-07-09 stsp Short alias for
777 97b3a7be 2019-07-09 stsp .Cm revert .
778 dfc23429 2019-08-11 stsp .It Cm commit Oo Fl m Ar message Oc Op Ar path ...
779 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
780 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
783 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
784 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
786 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
787 1dd86744 2019-08-12 anthony .Cm got stage ,
788 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
789 4ed9f614 2019-08-04 stsp have not been staged.
791 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
792 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
793 15cd91f7 2019-05-12 stsp .It M Ta modified file
794 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
795 15cd91f7 2019-05-12 stsp .It A Ta new file was added
796 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
799 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
800 996d5ccd 2019-08-05 stsp recorded base commit.
803 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
804 15cd91f7 2019-05-12 stsp multiple base commits.
805 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
806 47ec7be7 2019-05-12 stsp .Cm got update
807 47ec7be7 2019-05-12 stsp across the entire work tree.
810 15cd91f7 2019-05-12 stsp .Cm got commit
811 15cd91f7 2019-05-12 stsp command requires the
812 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
813 aba9c984 2019-09-08 stsp environment variable to be set,
814 aba9c984 2019-09-08 stsp unless Git's
815 aba9c984 2019-09-08 stsp .Dv user.name
817 709ae9eb 2019-09-08 stsp .Dv user.email
818 709ae9eb 2019-09-08 stsp configuration settings can be
819 aba9c984 2019-09-08 stsp obtained from the repository's
820 aba9c984 2019-09-08 stsp .Pa .git/config
821 c9956ddf 2019-09-08 stsp file or from Git's global
822 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
823 c9956ddf 2019-09-08 stsp configuration file.
825 74416c47 2019-05-09 stsp The options for
826 74416c47 2019-05-09 stsp .Cm got commit
827 74416c47 2019-05-09 stsp are as follows:
828 74416c47 2019-05-09 stsp .Bl -tag -width Ds
829 74ff3f23 2019-07-07 stsp .It Fl m Ar message
830 74416c47 2019-05-09 stsp Use the specified log message when creating the new commit.
831 23594da9 2019-05-13 stsp Without the
834 23594da9 2019-05-13 stsp .Cm got commit
835 23594da9 2019-05-13 stsp opens a temporary file in an editor where a log message can be written.
838 cfce0458 2019-07-28 stsp .Cm got commit
839 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
840 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
841 916f288c 2019-07-30 stsp .Dq refs/heads/
842 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
843 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
844 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
845 cfce0458 2019-07-28 stsp If a path is found to be out of date,
846 cfce0458 2019-07-28 stsp .Cm got update
847 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
848 cfce0458 2019-07-28 stsp in the repository.
850 97b3a7be 2019-07-09 stsp Short alias for
851 97b3a7be 2019-07-09 stsp .Cm commit .
852 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
853 234035bc 2019-06-01 stsp Merge changes from a single
855 234035bc 2019-06-01 stsp into the work tree.
856 234035bc 2019-06-01 stsp The specified
858 234035bc 2019-06-01 stsp must be on a different branch than the work tree's base commit.
859 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
860 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
861 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
863 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
864 234035bc 2019-06-01 stsp .Bl -column YXZ description
865 234035bc 2019-06-01 stsp .It G Ta file was merged
866 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
867 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
868 234035bc 2019-06-01 stsp .It D Ta file was deleted
869 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
870 234035bc 2019-06-01 stsp .It A Ta new file was added
871 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
874 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
875 234035bc 2019-06-01 stsp may be viewed with
876 234035bc 2019-06-01 stsp .Cm got diff ,
877 234035bc 2019-06-01 stsp amended manually or with further
878 234035bc 2019-06-01 stsp .Cm got cherrypick
880 234035bc 2019-06-01 stsp committed with
881 234035bc 2019-06-01 stsp .Cm got commit ,
882 234035bc 2019-06-01 stsp or discarded again with
883 234035bc 2019-06-01 stsp .Cm got revert .
885 234035bc 2019-06-01 stsp .Cm got cherrypick
886 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
887 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
888 234035bc 2019-06-01 stsp to a single base commit with
889 234035bc 2019-06-01 stsp .Cm got update .
890 234035bc 2019-06-01 stsp If the work tree already contains files with merge conflicts, these
891 234035bc 2019-06-01 stsp conflicts must be resolved first.
893 97b3a7be 2019-07-09 stsp Short alias for
894 97b3a7be 2019-07-09 stsp .Cm cherrypick .
895 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
896 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
898 5ef14e63 2019-06-02 stsp into the work tree.
899 5ef14e63 2019-06-02 stsp The specified
901 5ef14e63 2019-06-02 stsp must be on the same branch as the work tree's base commit.
902 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
903 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
904 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
906 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
907 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
908 5ef14e63 2019-06-02 stsp .It G Ta file was merged
909 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
910 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
911 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
912 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
913 5ef14e63 2019-06-02 stsp .It A Ta new file was added
914 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
917 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
918 5ef14e63 2019-06-02 stsp which may be viewed with
919 5ef14e63 2019-06-02 stsp .Cm got diff ,
920 5ef14e63 2019-06-02 stsp amended manually or with further
921 778a73c2 2019-07-12 stsp .Cm got backout
923 5ef14e63 2019-06-02 stsp committed with
924 5ef14e63 2019-06-02 stsp .Cm got commit ,
925 5ef14e63 2019-06-02 stsp or discarded again with
926 5ef14e63 2019-06-02 stsp .Cm got revert .
928 92228c38 2019-06-02 stsp .Cm got backout
929 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
930 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
931 92228c38 2019-06-02 stsp to a single base commit with
932 92228c38 2019-06-02 stsp .Cm got update .
933 92228c38 2019-06-02 stsp If the work tree already contains files with merge conflicts, these
934 92228c38 2019-06-02 stsp conflicts must be resolved first.
936 97b3a7be 2019-07-09 stsp Short alias for
937 97b3a7be 2019-07-09 stsp .Cm backout .
938 dfc23429 2019-08-11 stsp .It Cm rebase Oo Fl a Oc Oo Fl c Oc Op Ar branch
939 818c7501 2019-07-11 stsp Rebase commits on the specified
941 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
944 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
945 bc3056e3 2019-08-18 stsp Rebasing begins with the first descendant commit of the youngest
946 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
948 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
949 f09e2405 2019-07-11 stsp of the specified
951 f09e2405 2019-07-11 stsp has been rebased.
954 2b6826ba 2020-02-24 stsp .Cm got rebase
955 2b6826ba 2020-02-24 stsp is used as intended, the specified
957 c10890ce 2020-02-25 stsp represents a local commit history and may already contain changes
958 c10890ce 2020-02-25 stsp that are not yet visible in any other repositories.
959 2b6826ba 2020-02-24 stsp The work tree's current branch, which must be set with
960 2b6826ba 2020-02-24 stsp .Cm got update -b
961 2b6826ba 2020-02-24 stsp before starting the
963 2b6826ba 2020-02-24 stsp operation, represents a branch from a remote repository which shares
964 2b6826ba 2020-02-24 stsp a common history with the specified
966 c10890ce 2020-02-25 stsp but has progressed, and perhaps diverged, due to commits added to the
967 c10890ce 2020-02-25 stsp remote repository.
969 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
970 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
971 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
972 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
973 818c7501 2019-07-11 stsp .Ar branch ,
974 818c7501 2019-07-11 stsp but with different commit IDs.
975 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
976 f09e2405 2019-07-11 stsp the new version of the specified
978 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
980 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
981 818c7501 2019-07-11 stsp using the following status codes:
982 818c7501 2019-07-11 stsp .Bl -column YXZ description
983 818c7501 2019-07-11 stsp .It G Ta file was merged
984 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
985 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
986 818c7501 2019-07-11 stsp .It D Ta file was deleted
987 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
988 818c7501 2019-07-11 stsp .It A Ta new file was added
989 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
992 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
993 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
994 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
996 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
998 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
999 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
1000 f09e2405 2019-07-11 stsp when the rebase operation continues.
1002 818c7501 2019-07-11 stsp .Cm got rebase
1003 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
1004 a85446b2 2020-01-04 stsp If the work tree is not yet fully updated to the tip commit of its
1005 a85446b2 2020-01-04 stsp branch then the work tree must first be updated with
1006 818c7501 2019-07-11 stsp .Cm got update .
1007 4ed9f614 2019-08-04 stsp If changes have been staged with
1008 4ed9f614 2019-08-04 stsp .Cm got stage ,
1009 bc3056e3 2019-08-18 stsp these changes must first be committed with
1010 4ed9f614 2019-08-04 stsp .Cm got commit
1011 4ed9f614 2019-08-04 stsp or unstaged with
1012 4ed9f614 2019-08-04 stsp .Cm got unstage .
1013 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
1014 f09e2405 2019-07-11 stsp committed with
1015 f09e2405 2019-07-11 stsp .Cm got commit
1016 f09e2405 2019-07-11 stsp or reverted with
1017 f09e2405 2019-07-11 stsp .Cm got revert .
1019 64c6d990 2019-07-11 stsp .Ar branch
1020 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
1021 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
1024 7d5807f4 2019-07-11 stsp .Cm got update
1026 7d5807f4 2019-07-11 stsp .Cm got commit
1027 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
1028 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
1029 7d5807f4 2019-07-11 stsp conflict resolution purposes.
1031 818c7501 2019-07-11 stsp The options for
1032 818c7501 2019-07-11 stsp .Cm got rebase
1033 818c7501 2019-07-11 stsp are as follows:
1034 818c7501 2019-07-11 stsp .Bl -tag -width Ds
1036 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
1037 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1039 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
1040 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1043 818c7501 2019-07-11 stsp Short alias for
1044 818c7501 2019-07-11 stsp .Cm rebase .
1045 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
1046 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
1047 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
1049 6e54d307 2020-02-24 stsp Before starting a
1050 6e54d307 2020-02-24 stsp .Cm histedit
1051 6e54d307 2020-02-24 stsp operation the work tree's current branch must be set with
1052 6e54d307 2020-02-24 stsp .Cm got update -b
1053 6e54d307 2020-02-24 stsp to the branch which should be edited, unless this branch is already the
1054 6e54d307 2020-02-24 stsp current branch of the work tree.
1055 6e54d307 2020-02-24 stsp The tip of this branch represents the upper bound (inclusive) of commits
1056 6e54d307 2020-02-24 stsp touched by the
1057 6e54d307 2020-02-24 stsp .Cm histedit
1058 6e54d307 2020-02-24 stsp operation.
1060 6e54d307 2020-02-24 stsp Furthermore, the work tree's base commit
1061 6e54d307 2020-02-24 stsp must be set with
1062 6e54d307 2020-02-24 stsp .Cm got update -c
1063 6e54d307 2020-02-24 stsp to a point in this branch's commit history where editing should begin.
1064 6e54d307 2020-02-24 stsp This commit represents the lower bound (non-inclusive) of commits touched
1066 6e54d307 2020-02-24 stsp .Cm histedit
1067 6e54d307 2020-02-24 stsp operation.
1069 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
1070 0ebf8283 2019-07-24 stsp .Ar histedit script
1071 46fa4c83 2020-02-24 stsp which can be written in an editor based on a template, passed on the
1072 46fa4c83 2020-02-24 stsp command line, or generated with the
1074 083957f4 2020-02-24 stsp option if only log messages need to be edited.
1076 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
1077 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
1078 0ebf8283 2019-07-24 stsp whitespace and an argument.
1079 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
1080 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
1081 0ebf8283 2019-07-24 stsp Lines which begin with the
1083 0ebf8283 2019-07-24 stsp character are ignored entirely.
1085 0ebf8283 2019-07-24 stsp The available commands are as follows:
1086 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
1087 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
1088 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
1089 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
1090 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
1091 0ebf8283 2019-07-24 stsp listed further below that will be used.
1092 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
1093 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
1094 0ebf8283 2019-07-24 stsp the commit on the previous line.
1095 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
1096 0ebf8283 2019-07-24 stsp log message can be written.
1099 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
1100 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
1102 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
1103 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
1104 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
1105 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
1106 498a90b7 2019-07-25 stsp switched to it.
1108 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
1109 0ebf8283 2019-07-24 stsp using the following status codes:
1110 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
1111 0ebf8283 2019-07-24 stsp .It G Ta file was merged
1112 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
1113 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
1114 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
1115 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
1116 0ebf8283 2019-07-24 stsp .It A Ta new file was added
1117 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1120 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
1121 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
1122 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
1123 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
1125 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
1126 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
1127 0ebf8283 2019-07-24 stsp when the histedit operation continues.
1129 0ebf8283 2019-07-24 stsp .Cm got histedit
1130 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
1131 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
1132 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
1133 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
1134 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
1135 0ebf8283 2019-07-24 stsp to a single base commit with
1136 0ebf8283 2019-07-24 stsp .Cm got update .
1137 4ed9f614 2019-08-04 stsp If changes have been staged with
1138 4ed9f614 2019-08-04 stsp .Cm got stage ,
1139 bc3056e3 2019-08-18 stsp these changes must first be committed with
1140 4ed9f614 2019-08-04 stsp .Cm got commit
1141 4ed9f614 2019-08-04 stsp or unstaged with
1142 4ed9f614 2019-08-04 stsp .Cm got unstage .
1143 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
1144 0ebf8283 2019-07-24 stsp committed with
1145 0ebf8283 2019-07-24 stsp .Cm got commit
1146 0ebf8283 2019-07-24 stsp or reverted with
1147 0ebf8283 2019-07-24 stsp .Cm got revert .
1148 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
1149 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
1152 7ef62c4e 2020-02-24 stsp .Cm got update ,
1153 7ef62c4e 2020-02-24 stsp .Cm got rebase ,
1155 65db4ffb 2020-02-24 stsp .Cm got integrate
1156 65db4ffb 2020-02-24 stsp commands will refuse to run while a histedit operation is in progress.
1157 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
1158 0ebf8283 2019-07-24 stsp .Cm got commit
1159 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
1160 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
1162 0ebf8283 2019-07-24 stsp The options for
1163 0ebf8283 2019-07-24 stsp .Cm got histedit
1164 0ebf8283 2019-07-24 stsp are as follows:
1165 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
1167 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
1168 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1170 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
1171 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1172 ddbfac99 2020-02-24 stsp .It Fl F Ar histedit-script
1173 ddbfac99 2020-02-24 stsp Use the specified
1174 ddbfac99 2020-02-24 stsp .Ar histedit-script
1175 ddbfac99 2020-02-24 stsp instead of opening a temporary file in an editor where a histedit script
1176 ddbfac99 2020-02-24 stsp can be written.
1178 083957f4 2020-02-24 stsp Edit log messages only.
1179 083957f4 2020-02-24 stsp This option is a quick equivalent to a histedit script which edits
1180 2bdefe56 2020-02-24 tracey only log messages but otherwise leaves every picked commit as-is.
1183 083957f4 2020-02-24 stsp option can only be used when starting a new histedit operation.
1184 083957f4 2020-02-24 stsp If this option is used, no other command-line arguments are allowed.
1187 0ebf8283 2019-07-24 stsp Short alias for
1188 0ebf8283 2019-07-24 stsp .Cm histedit .
1189 2822a352 2019-10-15 stsp .It Cm integrate Ar branch
1190 2822a352 2019-10-15 stsp Integrate the specified
1191 2822a352 2019-10-15 stsp .Ar branch
1192 2822a352 2019-10-15 stsp into the work tree's current branch.
1193 2822a352 2019-10-15 stsp Files in the work tree are updated to match the contents on the integrated
1194 2822a352 2019-10-15 stsp .Ar branch ,
1195 2822a352 2019-10-15 stsp and the reference of the work tree's branch is changed to point at the
1196 2822a352 2019-10-15 stsp head commit of the integrated
1197 2822a352 2019-10-15 stsp .Ar branch .
1199 2822a352 2019-10-15 stsp Both branches can be considered equivalent after integration since they
1200 2822a352 2019-10-15 stsp will be pointing at the same commit.
1201 2822a352 2019-10-15 stsp Both branches remain available for future work, if desired.
1202 2822a352 2019-10-15 stsp In case the integrated
1203 2822a352 2019-10-15 stsp .Ar branch
1204 2822a352 2019-10-15 stsp is no longer needed it may be deleted with
1205 2822a352 2019-10-15 stsp .Cm got branch -d .
1207 2822a352 2019-10-15 stsp Show the status of each affected file, using the following status codes:
1208 2822a352 2019-10-15 stsp .Bl -column YXZ description
1209 2822a352 2019-10-15 stsp .It U Ta file was updated
1210 2822a352 2019-10-15 stsp .It D Ta file was deleted
1211 2822a352 2019-10-15 stsp .It A Ta new file was added
1212 2822a352 2019-10-15 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
1213 2822a352 2019-10-15 stsp .It ! Ta a missing versioned file was restored
1216 2822a352 2019-10-15 stsp .Cm got integrate
1217 2822a352 2019-10-15 stsp will refuse to run if certain preconditions are not met.
1218 2822a352 2019-10-15 stsp Most importantly, the
1219 2822a352 2019-10-15 stsp .Ar branch
1220 2822a352 2019-10-15 stsp must have been rebased onto the work tree's current branch with
1221 2822a352 2019-10-15 stsp .Cm got rebase
1222 2822a352 2019-10-15 stsp before it can be integrated, in order to linearize commit history and
1223 2822a352 2019-10-15 stsp resolve merge conflicts.
1224 2822a352 2019-10-15 stsp If the work tree contains multiple base commits it must first be updated
1225 2822a352 2019-10-15 stsp to a single base commit with
1226 2822a352 2019-10-15 stsp .Cm got update .
1227 2822a352 2019-10-15 stsp If changes have been staged with
1228 2822a352 2019-10-15 stsp .Cm got stage ,
1229 2822a352 2019-10-15 stsp these changes must first be committed with
1230 2822a352 2019-10-15 stsp .Cm got commit
1231 2822a352 2019-10-15 stsp or unstaged with
1232 2822a352 2019-10-15 stsp .Cm got unstage .
1233 2822a352 2019-10-15 stsp If the work tree contains local changes, these changes must first be
1234 2822a352 2019-10-15 stsp committed with
1235 2822a352 2019-10-15 stsp .Cm got commit
1236 2822a352 2019-10-15 stsp or reverted with
1237 2822a352 2019-10-15 stsp .Cm got revert .
1239 2822a352 2019-10-15 stsp Short alias for
1240 2822a352 2019-10-15 stsp .Cm integrate .
1241 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 ...
1242 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
1245 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
1246 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
1247 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
1248 4ed9f614 2019-08-04 stsp .Cm got status .
1250 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1251 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
1252 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
1253 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
1254 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
1257 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
1258 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
1259 9d8b19a4 2019-08-04 stsp committed.
1261 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
1262 4ed9f614 2019-08-04 stsp .Cm got commit ,
1263 4ed9f614 2019-08-04 stsp .Cm got status ,
1265 4ed9f614 2019-08-04 stsp .Cm got diff .
1266 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
1267 4ed9f614 2019-08-04 stsp .Cm got commit
1268 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
1269 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
1270 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
1272 4ed9f614 2019-08-04 stsp .Cm got status
1273 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
1275 4ed9f614 2019-08-04 stsp .Cm got diff
1276 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
1277 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
1279 4ed9f614 2019-08-04 stsp .Cm got revert
1280 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
1281 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
1283 4ed9f614 2019-08-04 stsp The options for
1284 4ed9f614 2019-08-04 stsp .Cm got stage
1285 4ed9f614 2019-08-04 stsp are as follows:
1286 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
1288 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
1289 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
1290 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
1291 1dd86744 2019-08-12 anthony among the specified paths.
1292 1dd86744 2019-08-12 anthony Otherwise, show all staged paths.
1294 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
1295 dc424a06 2019-08-07 stsp select or reject changes for staging based on
1297 6d23ec10 2019-08-08 stsp (stage change),
1299 6d23ec10 2019-08-08 stsp (reject change), and
1301 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
1302 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
1303 dc424a06 2019-08-07 stsp modified file content can be staged.
1304 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
1305 6d23ec10 2019-08-08 stsp their entirety.
1306 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
1309 3a070a2b 2019-08-07 stsp option, read
1314 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
1315 0e2f5884 2019-08-07 stsp .Ar response-script
1316 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
1319 4ed9f614 2019-08-04 stsp .Cm got stage
1320 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
1321 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
1322 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
1323 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
1324 4ed9f614 2019-08-04 stsp .Cm got update
1325 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
1326 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
1329 4ed9f614 2019-08-04 stsp .Cm got update ,
1330 4ed9f614 2019-08-04 stsp .Cm got rebase ,
1332 4ed9f614 2019-08-04 stsp .Cm got histedit
1333 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
1334 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
1335 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
1336 4ed9f614 2019-08-04 stsp .Cm got unstage
1337 4ed9f614 2019-08-04 stsp before it can be updated with
1338 4ed9f614 2019-08-04 stsp .Cm got update ,
1339 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
1341 4ed9f614 2019-08-04 stsp Short alias for
1342 4ed9f614 2019-08-04 stsp .Cm stage .
1343 dfc23429 2019-08-11 stsp .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
1344 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
1345 4ed9f614 2019-08-04 stsp back into non-staged status.
1348 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
1349 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
1351 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1352 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
1353 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
1354 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
1355 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
1356 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
1357 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
1358 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1361 2e1f37b0 2019-08-08 stsp The options for
1362 2e1f37b0 2019-08-08 stsp .Cm got unstage
1363 2e1f37b0 2019-08-08 stsp are as follows:
1364 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
1366 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
1367 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
1369 2e1f37b0 2019-08-08 stsp (unstage change),
1371 2e1f37b0 2019-08-08 stsp (keep change staged), and
1373 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
1374 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
1375 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
1376 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
1377 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
1380 2e1f37b0 2019-08-08 stsp option, read
1385 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
1386 2e1f37b0 2019-08-08 stsp .Ar response-script
1387 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
1390 4ed9f614 2019-08-04 stsp Short alias for
1391 4ed9f614 2019-08-04 stsp .Cm unstage .
1392 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 ...
1393 896e9b6f 2019-08-26 stsp Parse and print contents of objects to standard output in a line-based
1394 896e9b6f 2019-08-26 stsp text format.
1395 896e9b6f 2019-08-26 stsp Content of commit, tree, and tag objects is printed in a way similar
1396 896e9b6f 2019-08-26 stsp to the actual content stored in such objects.
1397 896e9b6f 2019-08-26 stsp Blob object contents are printed as they would appear in files on disk.
1399 896e9b6f 2019-08-26 stsp Attempt to interpret each argument as a reference, a tag name, or
1400 896e9b6f 2019-08-26 stsp an object ID SHA1 hash.
1401 01073a5d 2019-08-22 stsp References will be resolved to an object ID.
1402 01073a5d 2019-08-22 stsp Tag names will resolved to a tag object.
1403 01073a5d 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1404 01073a5d 2019-08-22 stsp automatically, provided the abbreviation is unique.
1406 896e9b6f 2019-08-26 stsp If none of the above interpretations produce a valid result, or if the
1408 896e9b6f 2019-08-26 stsp option is used, attempt to interpret the argument as a path which will
1409 896e9b6f 2019-08-26 stsp be resolved to the ID of an object found at this path in the repository.
1411 01073a5d 2019-08-22 stsp The options for
1412 01073a5d 2019-08-22 stsp .Cm got cat
1413 01073a5d 2019-08-22 stsp are as follows:
1414 01073a5d 2019-08-22 stsp .Bl -tag -width Ds
1415 896e9b6f 2019-08-26 stsp .It Fl c Ar commit
1416 896e9b6f 2019-08-26 stsp Look up paths in the specified
1417 896e9b6f 2019-08-26 stsp .Ar commit .
1418 896e9b6f 2019-08-26 stsp If this option is not used, paths are looked up in the commit resolved
1419 896e9b6f 2019-08-26 stsp via the repository's HEAD reference.
1420 896e9b6f 2019-08-26 stsp The expected argument is a commit ID SHA1 hash or an existing reference
1421 896e9b6f 2019-08-26 stsp or tag name which will be resolved to a commit ID.
1422 896e9b6f 2019-08-26 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1423 896e9b6f 2019-08-26 stsp automatically, provided the abbreviation is unique.
1424 01073a5d 2019-08-22 stsp .It Fl r Ar repository-path
1425 01073a5d 2019-08-22 stsp Use the repository at the specified path.
1426 01073a5d 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1427 01073a5d 2019-08-22 stsp working directory.
1428 01073a5d 2019-08-22 stsp If this directory is a
1430 01073a5d 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1432 896e9b6f 2019-08-26 stsp Interpret all arguments as paths only.
1433 896e9b6f 2019-08-26 stsp This option can be used to resolve ambiguity in cases where paths
1434 896e9b6f 2019-08-26 stsp look like tag names, reference names, or object IDs.
1437 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
1438 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
1439 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
1440 74416c47 2019-05-09 stsp The author's name and email address for
1441 21a44f98 2019-07-15 stsp .Cm got commit
1443 21a44f98 2019-07-15 stsp .Cm got import ,
1444 74416c47 2019-05-09 stsp for example:
1445 aba9c984 2019-09-08 stsp .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
1448 84792843 2019-08-09 stsp may fail to parse commits without an email address in author data,
1450 84792843 2019-08-09 stsp attempts to reject
1451 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
1452 84792843 2019-08-09 stsp environment variables with a missing email address.
1454 c9956ddf 2019-09-08 stsp If present, Git's
1455 aba9c984 2019-09-08 stsp .Dv user.name
1457 709ae9eb 2019-09-08 stsp .Dv user.email
1458 709ae9eb 2019-09-08 stsp configuration settings in the repository's
1459 aba9c984 2019-09-08 stsp .Pa .git/config
1460 aba9c984 2019-09-08 stsp file will override the value of
1461 aba9c984 2019-09-08 stsp .Ev GOT_AUTHOR .
1462 c9956ddf 2019-09-08 stsp However, the
1463 c9956ddf 2019-09-08 stsp .Dv user.name
1465 c9956ddf 2019-09-08 stsp .Dv user.email
1466 c9956ddf 2019-09-08 stsp configuration settings contained in Git's global
1467 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1468 c9956ddf 2019-09-08 stsp configuration file will be used only if the
1469 c9956ddf 2019-09-08 stsp .Ev GOT_AUTHOR
1470 c9956ddf 2019-09-08 stsp environment variable is
1473 1dd86744 2019-08-12 anthony .It Ev VISUAL , EDITOR
1474 23594da9 2019-05-13 stsp The editor spawned by
1475 8e7bd50a 2019-08-22 stsp .Cm got commit ,
1476 8e7bd50a 2019-08-22 stsp .Cm got import ,
1478 8e7bd50a 2019-08-22 stsp .Cm got tag .
1479 b1ebc001 2019-08-13 stsp .It Ev GOT_LOG_DEFAULT_LIMIT
1480 b1ebc001 2019-08-13 stsp The default limit on the number of commits traversed by
1481 b1ebc001 2019-08-13 stsp .Cm got log .
1482 b1ebc001 2019-08-13 stsp If set to zero, the limit is unbounded.
1483 b1ebc001 2019-08-13 stsp This variable will be silently ignored if it is set to a non-numeric value.
1485 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
1486 5c860e29 2018-03-12 stsp .Ex -std got
1487 97925469 2018-03-17 stsp .Sh EXAMPLES
1488 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
1490 fa6e0e48 2019-05-23 stsp This step currently requires
1491 fa6e0e48 2019-05-23 stsp .Xr git 1 :
1493 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
1494 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
1496 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
1498 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
1499 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
1500 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
1502 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
1503 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
1505 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
1507 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
1509 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
1511 e70c17ce 2019-05-22 stsp .Dl $ got status
1512 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
1514 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
1516 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
1518 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
1520 4e759de4 2019-06-26 stsp .Dl $ got branch -l
1522 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
1523 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
1524 d83d9d5c 2019-05-13 stsp which is forked off the
1525 d83d9d5c 2019-05-13 stsp .Dq master
1528 4e759de4 2019-06-26 stsp .Dl $ got branch unified-buffer-cache master
1530 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
1531 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
1532 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
1534 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
1536 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
1537 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
1539 fa6e0e48 2019-05-23 stsp .Dl $ got commit
1541 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
1542 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
1543 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
1545 48c8c60d 2020-01-27 stsp .Dl $ got log -p -l 3
1547 5b666081 2020-02-24 stsp In a work tree or a git repository directory, log the history of a subdirectory:
1549 5b666081 2020-02-24 stsp .Dl $ got log sys/uvm
1551 5b666081 2020-02-24 stsp While operating inside a work tree, paths are specified relative to the current
1552 5b666081 2020-02-24 stsp working directory, so this command will log the subdirectory
1553 5b666081 2020-02-24 stsp .Pa sys/uvm :
1555 5b666081 2020-02-24 stsp .Dl $ cd sys/uvm && got log '.'
1557 5b666081 2020-02-24 stsp And this command has the same effect:
1559 5b666081 2020-02-24 stsp .Dl $ cd sys/dev/usb && got log ../../uvm
1561 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
1563 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
1564 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
1566 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
1567 e70c17ce 2019-05-22 stsp with a pre-defined log message.
1569 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
1571 95fc3404 2019-07-15 stsp Update any work tree checked out from the
1572 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
1573 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
1575 95fc3404 2019-07-15 stsp .Dl $ got update
1577 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
1578 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
1579 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
1581 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1582 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
1583 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
1584 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1586 9221fb1e 2019-06-26 stsp Fetch new upstream commits into the local repository's master branch.
1587 9221fb1e 2019-06-26 stsp This step currently requires
1588 9221fb1e 2019-06-26 stsp .Xr git 1 :
1590 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
1591 fa6e0e48 2019-05-23 stsp .Dl $ git fetch origin master:master
1593 fa6e0e48 2019-05-23 stsp Rebase the
1594 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
1595 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
1596 fa6e0e48 2019-05-23 stsp .Dq master
1599 818c7501 2019-07-11 stsp .Dl $ got update -b master
1600 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
1602 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
1603 1dd86744 2019-08-12 anthony The patch can be mailed out for review and applied to
1604 1dd86744 2019-08-12 anthony .Ox Ns 's
1605 1dd86744 2019-08-12 anthony CVS tree:
1607 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
1609 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
1610 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
1613 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
1614 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
1615 0ebf8283 2019-07-24 stsp .Dl $ got histedit
1617 7b3fde24 2019-07-28 stsp Additional steps are necessary if local changes need to be pushed back
1618 7b3fde24 2019-07-28 stsp to the remote repository, which currently requires
1619 7b3fde24 2019-07-28 stsp .Cm git fetch
1621 7b3fde24 2019-07-28 stsp .Cm git push .
1622 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
1623 ff2cf171 2019-07-28 stsp .Dq git clone --bare ,
1625 ff2cf171 2019-07-28 stsp .Dq refspec
1626 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
1628 ff2cf171 2019-07-28 stsp .Dq refs/remotes
1629 ff2cf171 2019-07-28 stsp namespace of the local repository.
1630 ff2cf171 2019-07-28 stsp This can achieved by setting Git's
1631 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
1632 ff2cf171 2019-07-28 stsp configuration variable to the value
1633 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
1635 ff2cf171 2019-07-28 stsp .Cm git config
1638 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1639 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
1641 ff2cf171 2019-07-28 stsp Alternatively, the following
1643 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
1644 ff2cf171 2019-07-28 stsp .Pa config
1647 ff2cf171 2019-07-28 stsp .Dl [remote "origin"]
1648 ff2cf171 2019-07-28 stsp .Dl url = ...
1649 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
1651 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
1652 ff2cf171 2019-07-28 stsp .Dq refs/heads
1653 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
1654 ff2cf171 2019-07-28 stsp .Cm got checkout
1655 ff2cf171 2019-07-28 stsp and, if needed, created with
1656 ff2cf171 2019-07-28 stsp .Cm got branch .
1658 ff2cf171 2019-07-28 stsp Branches in the
1659 ff2cf171 2019-07-28 stsp .Dq remotes/origin
1660 ff2cf171 2019-07-28 stsp namespace can be updated with incoming changes from the remote
1661 ff2cf171 2019-07-28 stsp repository with
1662 ff2cf171 2019-07-28 stsp .Cm git fetch :
1664 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1665 ff2cf171 2019-07-28 stsp .Dl $ git fetch
1667 7b0db533 2020-02-04 stsp To make changes fetched from the remote repository appear on the
1668 ff2cf171 2019-07-28 stsp .Dq master
1669 7b0db533 2020-02-04 stsp branch, the
1670 ff2cf171 2019-07-28 stsp .Dq master
1671 ff2cf171 2019-07-28 stsp branch must be rebased onto the
1672 ff2cf171 2019-07-28 stsp .Dq origin/master
1674 7b0db533 2020-02-04 stsp This will also merge local changes, if any, with the incoming changes:
1676 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
1677 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
1680 083957f4 2020-02-24 stsp .Dq master
1681 083957f4 2020-02-24 stsp branch, log messages for local changes can now be amended with
1683 083957f4 2020-02-24 stsp by other developers and any other important new information:
1685 083957f4 2020-02-24 stsp .Dl $ got update -c origin/master
1686 083957f4 2020-02-24 stsp .Dl $ got histedit -m
1688 7b0db533 2020-02-04 stsp Local changes on the
1689 ff2cf171 2019-07-28 stsp .Dq master
1690 ff2cf171 2019-07-28 stsp branch can then be pushed to the remote
1691 ff2cf171 2019-07-28 stsp repository with
1692 ff2cf171 2019-07-28 stsp .Cm git push :
1694 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1695 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
1697 14c25ea2 2019-10-15 stsp In order to merge changes committed to the
1698 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1699 14c25ea2 2019-10-15 stsp branch back into the
1700 14c25ea2 2019-10-15 stsp .Dq master
1701 14c25ea2 2019-10-15 stsp branch, the
1702 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1703 14c25ea2 2019-10-15 stsp branch must first be rebased onto the
1704 14c25ea2 2019-10-15 stsp .Dq master
1707 14c25ea2 2019-10-15 stsp .Dl $ got update -b master
1708 14c25ea2 2019-10-15 stsp .Dl $ got rebase unified-buffer-cache
1710 14c25ea2 2019-10-15 stsp Changes on the
1711 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1712 14c25ea2 2019-10-15 stsp branch can now be made visible on the
1713 14c25ea2 2019-10-15 stsp .Dq master
1714 14c25ea2 2019-10-15 stsp branch with
1715 14c25ea2 2019-10-15 stsp .Cm got integrate .
1716 14c25ea2 2019-10-15 stsp Because the rebase operation switched the work tree to the
1717 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1718 14c25ea2 2019-10-15 stsp branch, the work tree must be switched back to the
1719 14c25ea2 2019-10-15 stsp .Dq master
1720 14c25ea2 2019-10-15 stsp branch before the
1721 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1722 14c25ea2 2019-10-15 stsp branch can be integrated into
1723 14c25ea2 2019-10-15 stsp .Dq master :
1725 14c25ea2 2019-10-15 stsp .Dl $ got update -b master
1726 14c25ea2 2019-10-15 stsp .Dl $ got integrate unified-buffer-cache
1727 5c860e29 2018-03-12 stsp .Sh SEE ALSO
1728 2312fc47 2019-07-15 stsp .Xr tog 1 ,
1729 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
1730 285dc8a4 2018-03-13 stsp .Xr got-worktree 5
1731 1a208aaf 2018-04-01 stsp .Sh AUTHORS
1732 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
1733 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
1734 bc3056e3 2019-08-18 stsp .An Joshua Stein Aq Mt jcs@openbsd.org
1735 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
1737 fa6e0e48 2019-05-23 stsp is a work-in-progress and many commands remain to be implemented.
1738 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
1740 ff2cf171 2019-07-28 stsp to perform many tasks, in particular tasks related to repository
1741 ff2cf171 2019-07-28 stsp administration and tasks which require a network connection.
