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.
180 38e11793 2018-06-13 stsp .It Fl p Ar path-prefix
181 38e11793 2018-06-13 stsp Restrict the work tree to a subset of the repository's tree hierarchy.
182 38e11793 2018-06-13 stsp Only files beneath the specified
183 38e11793 2018-06-13 stsp .Ar path-prefix
184 38e11793 2018-06-13 stsp will be checked out.
187 97b3a7be 2019-07-09 stsp Short alias for
188 97b3a7be 2019-07-09 stsp .Cm checkout .
189 dfc23429 2019-08-11 stsp .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Op Ar path ...
190 024e9686 2019-05-14 stsp Update an existing work tree to a different commit.
191 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
192 7f838b36 2019-02-08 stsp .Bl -column YXZ description
193 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
194 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
195 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
196 7f838b36 2019-02-08 stsp .It D Ta file was deleted
197 7f838b36 2019-02-08 stsp .It A Ta new file was added
198 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
199 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
204 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
205 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
206 f2ea84fa 2019-07-27 stsp specified paths.
207 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
208 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
209 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
212 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
213 c4cdcb68 2019-04-03 stsp multiple base commits.
214 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
215 47ec7be7 2019-05-12 stsp .Cm got update
216 47ec7be7 2019-05-12 stsp across the entire work tree.
217 024e9686 2019-05-14 stsp Specifying a
219 024e9686 2019-05-14 stsp is incompatible with the
223 4ed9f614 2019-08-04 stsp .Cm got update
224 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
225 4ed9f614 2019-08-04 stsp If changes have been staged with
226 4ed9f614 2019-08-04 stsp .Cm got stage ,
227 bc3056e3 2019-08-18 stsp these changes must first be committed with
228 4ed9f614 2019-08-04 stsp .Cm got commit
229 4ed9f614 2019-08-04 stsp or unstaged with
230 4ed9f614 2019-08-04 stsp .Cm got unstage .
232 507dc3bb 2018-12-29 stsp The options for
233 507dc3bb 2018-12-29 stsp .Cm got update
234 507dc3bb 2018-12-29 stsp are as follows:
235 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
236 024e9686 2019-05-14 stsp .It Fl b Ar branch
237 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
239 024e9686 2019-05-14 stsp before updating the work tree.
240 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
241 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
242 507dc3bb 2018-12-29 stsp Update the work tree to the specified
243 507dc3bb 2018-12-29 stsp .Ar commit .
244 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
245 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
246 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
247 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
248 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
249 024e9686 2019-05-14 stsp branch will be used.
252 97b3a7be 2019-07-09 stsp Short alias for
253 97b3a7be 2019-07-09 stsp .Cm update .
254 dfc23429 2019-08-11 stsp .It Cm status Op Ar path ...
255 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
256 6bad629b 2019-02-04 stsp using the following status codes:
257 6bad629b 2019-02-04 stsp .Bl -column YXZ description
258 6bad629b 2019-02-04 stsp .It M Ta modified file
259 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
260 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
261 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
262 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
263 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
264 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
266 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
267 2a06fe5f 2019-08-24 stsp .It N Ta non-existent
269 2a06fe5f 2019-08-24 stsp specified on the command line
274 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
275 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
277 4ed9f614 2019-08-04 stsp If changes have been staged with
278 4ed9f614 2019-08-04 stsp .Cm got stage ,
279 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
280 4ed9f614 2019-08-04 stsp status codes:
281 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
282 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
283 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
284 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
287 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
288 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
289 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
290 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
293 6841da00 2019-08-08 stsp For compatibility with
296 bd8de430 2019-10-04 stsp .Xr git 1 ,
297 6841da00 2019-08-08 stsp .Cm got status
300 bd8de430 2019-10-04 stsp patterns from
301 6841da00 2019-08-08 stsp .Pa .cvsignore
303 bd8de430 2019-10-04 stsp .Pa .gitignore
304 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
305 bd8de430 2019-10-04 stsp which match these patterns.
306 bd8de430 2019-10-04 stsp As an extension to
308 bd8de430 2019-10-04 stsp matching rules,
309 bd8de430 2019-10-04 stsp .Cm got status
310 bd8de430 2019-10-04 stsp supports consecutive asterisks,
312 bd8de430 2019-10-04 stsp which will match an arbitrary amount of directories.
314 6841da00 2019-08-08 stsp .Xr cvs 1 ,
315 6841da00 2019-08-08 stsp .Cm got status
316 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
318 bd8de430 2019-10-04 stsp .Xr git 1 ,
319 bd8de430 2019-10-04 stsp .Cm got status
320 bd8de430 2019-10-04 stsp does not support negated ignore patterns prefixed with
322 bd8de430 2019-10-04 stsp and gives no special significance to the location of path component separators,
324 bd8de430 2019-10-04 stsp in a pattern.
326 97b3a7be 2019-07-09 stsp Short alias for
327 97b3a7be 2019-07-09 stsp .Cm status .
328 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
329 38e11793 2018-06-13 stsp Display history of a repository.
332 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
333 dc990cbf 2020-02-22 stsp If invoked in a work tree, the
335 dc990cbf 2020-02-22 stsp is interpreted relative to the current working directory,
336 dc990cbf 2020-02-22 stsp and the work tree's path prefix is implicitly prepended.
337 dc990cbf 2020-02-22 stsp Otherwise, the path is interpreted relative to the repository root.
339 38e11793 2018-06-13 stsp The options for
340 38e11793 2018-06-13 stsp .Cm got log
341 38e11793 2018-06-13 stsp are as follows:
342 38e11793 2018-06-13 stsp .Bl -tag -width Ds
344 1137e0ae 2020-01-27 stsp Display individual commits which were merged into the current branch
345 1137e0ae 2020-01-27 stsp from other branches.
346 48c8c60d 2020-01-27 stsp By default,
347 48c8c60d 2020-01-27 stsp .Cm got log
348 48c8c60d 2020-01-27 stsp shows the linear history of the current branch only.
349 38e11793 2018-06-13 stsp .It Fl c Ar commit
350 38e11793 2018-06-13 stsp Start traversing history at the specified
351 38e11793 2018-06-13 stsp .Ar commit .
352 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
353 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
354 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
355 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
356 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
357 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
358 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
359 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
361 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
362 6238ee32 2018-06-13 stsp .It Fl l Ar N
363 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
364 b1ebc001 2019-08-13 stsp If this option is not specified, a default limit value of zero is used,
365 b1ebc001 2019-08-13 stsp which is treated as an unbounded limit.
367 b1ebc001 2019-08-13 stsp .Ev GOT_LOG_DEFAULT_LIMIT
368 b1ebc001 2019-08-13 stsp environment variable may be set to change this default value.
370 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
373 44392932 2019-08-25 stsp is specified, only show the patch of modifications at or within this path.
374 c6390436 2019-11-29 kn .It Fl s Ar search-pattern
375 c6390436 2019-11-29 kn If specified, show only commits with a log message matched by the extended
376 6841bf13 2019-11-29 kn regular expression
377 6841bf13 2019-11-29 kn .Ar search-pattern .
378 6841bf13 2019-11-29 kn Regular expression syntax is documented in
379 6841bf13 2019-11-29 kn .Xr re_format 7 .
380 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
381 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
382 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
383 04ca23f4 2018-07-16 stsp working directory.
384 e9cf2e30 2019-02-05 stsp If this directory is a
386 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
388 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
389 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
390 927df6b7 2019-02-10 stsp uncommitted changes in the work tree.
393 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
395 d24820bf 2019-08-11 stsp If two arguments are provided, treat each argument as a reference, a tag
396 d24820bf 2019-08-11 stsp name, or an object ID SHA1 hash, and display differences between the
397 d24820bf 2019-08-11 stsp corresponding objects.
398 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
399 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
400 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
402 c0cc5c62 2018-10-18 stsp The options for
403 c0cc5c62 2018-10-18 stsp .Cm got diff
404 c0cc5c62 2018-10-18 stsp are as follows:
405 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
406 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
407 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
408 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
409 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
410 b72f483a 2019-02-05 stsp Use the repository at the specified path.
411 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
412 b72f483a 2019-02-05 stsp working directory.
413 b72f483a 2019-02-05 stsp If this directory is a
415 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
417 4ed9f614 2019-08-04 stsp Show changes staged with
418 4ed9f614 2019-08-04 stsp .Cm got stage
419 4ed9f614 2019-08-04 stsp instead of showing local changes.
420 4ed9f614 2019-08-04 stsp This option is only valid when
421 4ed9f614 2019-08-04 stsp .Cm got diff
422 4ed9f614 2019-08-04 stsp is invoked in a work tree.
424 63035f9f 2019-10-06 stsp Ignore whitespace-only changes.
427 bc26cce8 2019-08-04 stsp Short alias for
429 dfc23429 2019-08-11 stsp .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
430 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
432 1ff8e573 2018-08-02 stsp The options for
433 1ff8e573 2018-08-02 stsp .Cm got blame
434 1ff8e573 2018-08-02 stsp are as follows:
435 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
436 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
437 1ff8e573 2018-08-02 stsp Start traversing history at the specified
438 1ff8e573 2018-08-02 stsp .Ar commit .
439 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
440 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
441 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
442 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
443 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
444 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
445 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
446 1ff8e573 2018-08-02 stsp working directory.
447 0c06baac 2019-02-05 stsp If this directory is a
449 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
452 bc26cce8 2019-08-04 stsp Short alias for
453 bc26cce8 2019-08-04 stsp .Cm blame .
454 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
455 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
456 5de5890b 2018-10-18 stsp directory path in the repository.
457 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
458 db0c2996 2019-02-10 stsp annotations:
459 db0c2996 2019-02-10 stsp .Bl -column YXZ description
460 848d6979 2019-08-12 stsp .It @ Ta entry is a symbolic link
461 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
462 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
463 63c5ca5d 2019-08-24 stsp .It $ Ta entry is a Git submodule
468 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
469 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
470 0c849583 2019-02-05 stsp if there is no work tree.
472 5de5890b 2018-10-18 stsp The options for
473 5de5890b 2018-10-18 stsp .Cm got tree
474 5de5890b 2018-10-18 stsp are as follows:
475 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
476 5de5890b 2018-10-18 stsp .It Fl c Ar commit
477 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
478 5de5890b 2018-10-18 stsp .Ar commit .
479 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
480 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
481 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
482 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
483 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
484 5de5890b 2018-10-18 stsp Use the repository at the specified path.
485 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
486 5de5890b 2018-10-18 stsp working directory.
487 0c849583 2019-02-05 stsp If this directory is a
489 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
491 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
493 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
496 bc26cce8 2019-08-04 stsp Short alias for
498 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
499 d0eebce4 2019-03-11 stsp Manage references in a repository.
501 d0eebce4 2019-03-11 stsp If no options are passed, expect two arguments and attempt to create,
502 d0eebce4 2019-03-11 stsp or update, the reference with the given
504 d0eebce4 2019-03-11 stsp and make it point at the given
505 d83d9d5c 2019-05-13 stsp .Ar target .
506 f16e4044 2019-10-09 stsp The name must be an absolute reference name, i.e. it must begin with
507 f16e4044 2019-10-09 stsp .Dq refs/ .
508 a54b6686 2019-06-28 stsp The target may be an object ID SHA1 hash or an existing reference which
509 a54b6686 2019-06-28 stsp will be resolved to an object ID.
510 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
511 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
513 d0eebce4 2019-03-11 stsp The options for
514 d0eebce4 2019-03-11 stsp .Cm got ref
515 d0eebce4 2019-03-11 stsp are as follows:
516 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
517 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
518 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
519 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
520 d0eebce4 2019-03-11 stsp working directory.
521 d0eebce4 2019-03-11 stsp If this directory is a
523 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
525 d0eebce4 2019-03-11 stsp List all existing references in the repository.
526 d0eebce4 2019-03-11 stsp .It Fl d Ar name
527 d0eebce4 2019-03-11 stsp Delete the reference with the specified name from the repository.
529 d1c1ae5f 2019-08-12 stsp Create a symbolic reference pointing at the specified
530 d1c1ae5f 2019-08-12 stsp .Ar target ,
531 d1c1ae5f 2019-08-12 stsp which must be an existing reference.
532 d1c1ae5f 2019-08-12 stsp Care should be taken not to create loops between references when
533 d1c1ae5f 2019-08-12 stsp this option is used.
535 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
536 da76fce2 2020-02-24 stsp Create, list, or delete branches.
538 4e759de4 2019-06-26 stsp Branches are managed via references which live in the
539 4e759de4 2019-06-26 stsp .Dq refs/heads/
540 4e759de4 2019-06-26 stsp reference namespace.
542 4e759de4 2019-06-26 stsp .Cm got branch
543 4e759de4 2019-06-26 stsp command operates on references in this namespace only.
545 ad89fa31 2019-10-04 stsp If invoked in a work tree without any arguments, print the name of the
546 ad89fa31 2019-10-04 stsp work tree's current branch.
550 a74f7e83 2019-11-10 stsp argument is passed, attempt to create a branch reference with the given name.
551 a74f7e83 2019-11-10 stsp By default the new branch reference will point at the latest commit on the
552 a74f7e83 2019-11-10 stsp work tree's current branch if invoked in a work tree, and otherwise to a commit
553 a74f7e83 2019-11-10 stsp resolved via the repository's HEAD reference.
555 da76fce2 2020-02-24 stsp If invoked in a work tree, once the branch was created successfully
556 da76fce2 2020-02-24 stsp switch the work tree's head reference to the newly created branch and
557 da76fce2 2020-02-24 stsp update files across the entire work tree, just like
558 da76fce2 2020-02-24 stsp .Cm got update -b Ar name
560 da76fce2 2020-02-24 stsp Show the status of each affected file, using the following status codes:
561 da76fce2 2020-02-24 stsp .Bl -column YXZ description
562 da76fce2 2020-02-24 stsp .It U Ta file was updated and contained no local changes
563 da76fce2 2020-02-24 stsp .It G Ta file was updated and local changes were merged cleanly
564 da76fce2 2020-02-24 stsp .It C Ta file was updated and conflicts occurred during merge
565 da76fce2 2020-02-24 stsp .It D Ta file was deleted
566 da76fce2 2020-02-24 stsp .It A Ta new file was added
567 da76fce2 2020-02-24 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
568 da76fce2 2020-02-24 stsp .It ! Ta a missing versioned file was restored
571 4e759de4 2019-06-26 stsp The options for
572 4e759de4 2019-06-26 stsp .Cm got branch
573 4e759de4 2019-06-26 stsp are as follows:
574 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
575 a74f7e83 2019-11-10 stsp .It Fl c Ar commit
576 a74f7e83 2019-11-10 stsp Make a newly created branch reference point at the specified
577 a74f7e83 2019-11-10 stsp .Ar commit .
578 a74f7e83 2019-11-10 stsp The expected
580 a74f7e83 2019-11-10 stsp argument is a commit ID SHA1 hash or an existing reference
581 a74f7e83 2019-11-10 stsp or tag name which will be resolved to a commit ID.
582 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
583 4e759de4 2019-06-26 stsp Use the repository at the specified path.
584 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
585 4e759de4 2019-06-26 stsp working directory.
586 4e759de4 2019-06-26 stsp If this directory is a
588 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
590 4e759de4 2019-06-26 stsp List all existing branches in the repository.
591 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
592 ba882ee3 2019-07-11 stsp with one the following annotations:
593 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
594 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
595 1dd86744 2019-08-12 anthony .It \(a~ Ta work tree's base commit is out-of-date
597 4e759de4 2019-06-26 stsp .It Fl d Ar name
598 4e759de4 2019-06-26 stsp Delete the branch with the specified name from the repository.
599 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
600 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
601 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
602 ce33d90e 2019-07-14 stsp Git's garbage collector.
604 da76fce2 2020-02-24 stsp Do not switch and update the work tree after creating a new branch.
607 97b3a7be 2019-07-09 stsp Short alias for
608 97b3a7be 2019-07-09 stsp .Cm branch .
609 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
610 8e7bd50a 2019-08-22 stsp Manage tags in a repository.
612 8e7bd50a 2019-08-22 stsp Tags are managed via references which live in the
613 8e7bd50a 2019-08-22 stsp .Dq refs/tags/
614 8e7bd50a 2019-08-22 stsp reference namespace.
616 8e7bd50a 2019-08-22 stsp .Cm got tag
617 8e7bd50a 2019-08-22 stsp command operates on references in this namespace only.
618 b3cd068e 2019-08-22 stsp References in this namespace point at tag objects which contain a pointer
619 b3cd068e 2019-08-22 stsp to another object, a tag message, as well as author and timestamp information.
621 80106605 2020-02-24 stsp Attempt to create a tag with the given
623 8e7bd50a 2019-08-22 stsp and make this tag point at the given
624 8e7bd50a 2019-08-22 stsp .Ar commit .
625 8e7bd50a 2019-08-22 stsp If no commit is specified, default to the latest commit on the work tree's
626 8e7bd50a 2019-08-22 stsp current branch if invoked in a work tree, and to a commit resolved via
627 8e7bd50a 2019-08-22 stsp the repository's HEAD reference otherwise.
629 8e7bd50a 2019-08-22 stsp The options for
630 8e7bd50a 2019-08-22 stsp .Cm got tag
631 8e7bd50a 2019-08-22 stsp are as follows:
632 8e7bd50a 2019-08-22 stsp .Bl -tag -width Ds
633 80106605 2020-02-24 stsp .It Fl c Ar commit
634 80106605 2020-02-24 stsp Make the newly created tag reference point at the specified
635 80106605 2020-02-24 stsp .Ar commit .
636 80106605 2020-02-24 stsp The expected
638 80106605 2020-02-24 stsp argument is a commit ID SHA1 hash or an existing reference or tag name which
639 80106605 2020-02-24 stsp will be resolved to a commit ID.
640 80106605 2020-02-24 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
641 80106605 2020-02-24 stsp automatically, provided the abbreviation is unique.
642 8e7bd50a 2019-08-22 stsp .It Fl m Ar message
643 80106605 2020-02-24 stsp Use the specified tag message when creating the new tag.
644 8e7bd50a 2019-08-22 stsp Without the
647 3a62228f 2019-11-08 stsp .Cm got tag
648 8e7bd50a 2019-08-22 stsp opens a temporary file in an editor where a tag message can be written.
649 8e7bd50a 2019-08-22 stsp .It Fl r Ar repository-path
650 8e7bd50a 2019-08-22 stsp Use the repository at the specified path.
651 8e7bd50a 2019-08-22 stsp If not specified, assume the repository is located at or above the current
652 8e7bd50a 2019-08-22 stsp working directory.
653 8e7bd50a 2019-08-22 stsp If this directory is a
655 8e7bd50a 2019-08-22 stsp work tree, use the repository path associated with this work tree.
657 8e7bd50a 2019-08-22 stsp List all existing tags in the repository instead of creating a new tag.
658 8e7bd50a 2019-08-22 stsp If this option is used, no other command-line arguments are allowed.
661 8e7bd50a 2019-08-22 stsp By design, the
662 8e7bd50a 2019-08-22 stsp .Cm got tag
663 8e7bd50a 2019-08-22 stsp command will not delete tags or change existing tags.
664 8e7bd50a 2019-08-22 stsp If a tag must be deleted, the
665 8e7bd50a 2019-08-22 stsp .Cm got ref
666 8e7bd50a 2019-08-22 stsp command may be used to delete a tag's reference.
667 8e7bd50a 2019-08-22 stsp This should only be done if the tag has not already been copied to
668 8e7bd50a 2019-08-22 stsp another repository.
669 022fae89 2019-12-06 tracey .It Cm add Oo Fl R Oc Oo Fl I Oc Ar path ...
670 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
671 d00136be 2019-03-26 stsp repository in the next commit.
673 4e68cba3 2019-11-23 stsp The options for
674 4e68cba3 2019-11-23 stsp .Cm got add
675 4e68cba3 2019-11-23 stsp are as follows:
676 4e68cba3 2019-11-23 stsp .Bl -tag -width Ds
678 4e68cba3 2019-11-23 stsp Permit recursion into directories.
679 4e68cba3 2019-11-23 stsp If this option is not specified,
680 4e68cba3 2019-11-23 stsp .Cm got add
681 4e68cba3 2019-11-23 stsp will refuse to run if a specified
683 4e68cba3 2019-11-23 stsp is a directory.
685 022fae89 2019-12-06 tracey With -R, add files even if they match a
686 022fae89 2019-12-06 tracey .Cm got status
687 022fae89 2019-12-06 tracey ignore pattern.
689 c29c428a 2019-12-16 stsp .It Cm remove Oo Fl f Oc Oo Fl k Oc Oo Fl R Oc Ar path ...
690 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
691 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
693 2ec1f75b 2019-03-26 stsp The options for
694 86d25a1b 2019-07-11 stsp .Cm got remove
695 2ec1f75b 2019-03-26 stsp are as follows:
696 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
698 17ed4618 2019-06-02 stsp Perform the operation even if a file contains uncommitted modifications.
700 70e3e7f5 2019-12-13 tracey Keep affected files on disk.
702 f2a9dc41 2019-12-13 tracey Permit recursion into directories.
703 f2a9dc41 2019-12-13 tracey If this option is not specified,
704 f2a9dc41 2019-12-13 tracey .Cm got remove
705 f2a9dc41 2019-12-13 tracey will refuse to run if a specified
707 f2a9dc41 2019-12-13 tracey is a directory.
710 648e4ef7 2019-07-09 stsp Short alias for
711 648e4ef7 2019-07-09 stsp .Cm remove .
712 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 ...
713 bc3056e3 2019-08-18 stsp Revert any uncommitted changes in files at the specified paths.
714 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
715 1dd86744 2019-08-12 anthony work tree's base commit.
716 1dd86744 2019-08-12 anthony There is no way to bring discarded changes back after
717 a129376b 2019-03-28 stsp .Cm got revert !
719 e20a8b6f 2019-06-04 stsp If a file was added with
720 a129376b 2019-03-28 stsp .Cm got add
721 a129376b 2019-03-28 stsp it will become an unversioned file again.
722 e20a8b6f 2019-06-04 stsp If a file was deleted with
723 86d25a1b 2019-07-11 stsp .Cm got remove
724 a129376b 2019-03-28 stsp it will be restored.
726 0f6d7415 2019-08-08 stsp The options for
727 0f6d7415 2019-08-08 stsp .Cm got revert
728 0f6d7415 2019-08-08 stsp are as follows:
729 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
731 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
732 33aa809d 2019-08-08 stsp changes to revert based on
734 33aa809d 2019-08-08 stsp (revert change),
736 33aa809d 2019-08-08 stsp (keep change), and
738 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
739 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
740 33aa809d 2019-08-08 stsp modified file content can be reverted.
741 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
742 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
745 33aa809d 2019-08-08 stsp option, read
750 33aa809d 2019-08-08 stsp responses line-by-line from the specified
751 33aa809d 2019-08-08 stsp .Ar response-script
752 33aa809d 2019-08-08 stsp file instead of prompting interactively.
754 0f6d7415 2019-08-08 stsp Permit recursion into directories.
755 0f6d7415 2019-08-08 stsp If this option is not specified,
756 0f6d7415 2019-08-08 stsp .Cm got revert
757 0f6d7415 2019-08-08 stsp will refuse to run if a specified
759 0f6d7415 2019-08-08 stsp is a directory.
762 97b3a7be 2019-07-09 stsp Short alias for
763 97b3a7be 2019-07-09 stsp .Cm revert .
764 dfc23429 2019-08-11 stsp .It Cm commit Oo Fl m Ar message Oc Op Ar path ...
765 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
766 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
769 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
770 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
772 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
773 1dd86744 2019-08-12 anthony .Cm got stage ,
774 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
775 4ed9f614 2019-08-04 stsp have not been staged.
777 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
778 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
779 15cd91f7 2019-05-12 stsp .It M Ta modified file
780 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
781 15cd91f7 2019-05-12 stsp .It A Ta new file was added
782 1ebedb77 2019-10-19 stsp .It m Ta modified file modes (executable bit only)
785 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
786 996d5ccd 2019-08-05 stsp recorded base commit.
789 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
790 15cd91f7 2019-05-12 stsp multiple base commits.
791 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
792 47ec7be7 2019-05-12 stsp .Cm got update
793 47ec7be7 2019-05-12 stsp across the entire work tree.
796 15cd91f7 2019-05-12 stsp .Cm got commit
797 15cd91f7 2019-05-12 stsp command requires the
798 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
799 aba9c984 2019-09-08 stsp environment variable to be set,
800 aba9c984 2019-09-08 stsp unless Git's
801 aba9c984 2019-09-08 stsp .Dv user.name
803 709ae9eb 2019-09-08 stsp .Dv user.email
804 709ae9eb 2019-09-08 stsp configuration settings can be
805 aba9c984 2019-09-08 stsp obtained from the repository's
806 aba9c984 2019-09-08 stsp .Pa .git/config
807 c9956ddf 2019-09-08 stsp file or from Git's global
808 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
809 c9956ddf 2019-09-08 stsp configuration file.
811 74416c47 2019-05-09 stsp The options for
812 74416c47 2019-05-09 stsp .Cm got commit
813 74416c47 2019-05-09 stsp are as follows:
814 74416c47 2019-05-09 stsp .Bl -tag -width Ds
815 74ff3f23 2019-07-07 stsp .It Fl m Ar message
816 74416c47 2019-05-09 stsp Use the specified log message when creating the new commit.
817 23594da9 2019-05-13 stsp Without the
820 23594da9 2019-05-13 stsp .Cm got commit
821 23594da9 2019-05-13 stsp opens a temporary file in an editor where a log message can be written.
824 cfce0458 2019-07-28 stsp .Cm got commit
825 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
826 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
827 916f288c 2019-07-30 stsp .Dq refs/heads/
828 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
829 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
830 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
831 cfce0458 2019-07-28 stsp If a path is found to be out of date,
832 cfce0458 2019-07-28 stsp .Cm got update
833 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
834 cfce0458 2019-07-28 stsp in the repository.
836 97b3a7be 2019-07-09 stsp Short alias for
837 97b3a7be 2019-07-09 stsp .Cm commit .
838 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
839 234035bc 2019-06-01 stsp Merge changes from a single
841 234035bc 2019-06-01 stsp into the work tree.
842 234035bc 2019-06-01 stsp The specified
844 234035bc 2019-06-01 stsp must be on a different branch than the work tree's base commit.
845 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
846 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
847 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
849 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
850 234035bc 2019-06-01 stsp .Bl -column YXZ description
851 234035bc 2019-06-01 stsp .It G Ta file was merged
852 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
853 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
854 234035bc 2019-06-01 stsp .It D Ta file was deleted
855 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
856 234035bc 2019-06-01 stsp .It A Ta new file was added
857 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
860 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
861 234035bc 2019-06-01 stsp may be viewed with
862 234035bc 2019-06-01 stsp .Cm got diff ,
863 234035bc 2019-06-01 stsp amended manually or with further
864 234035bc 2019-06-01 stsp .Cm got cherrypick
866 234035bc 2019-06-01 stsp committed with
867 234035bc 2019-06-01 stsp .Cm got commit ,
868 234035bc 2019-06-01 stsp or discarded again with
869 234035bc 2019-06-01 stsp .Cm got revert .
871 234035bc 2019-06-01 stsp .Cm got cherrypick
872 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
873 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
874 234035bc 2019-06-01 stsp to a single base commit with
875 234035bc 2019-06-01 stsp .Cm got update .
876 234035bc 2019-06-01 stsp If the work tree already contains files with merge conflicts, these
877 234035bc 2019-06-01 stsp conflicts must be resolved first.
879 97b3a7be 2019-07-09 stsp Short alias for
880 97b3a7be 2019-07-09 stsp .Cm cherrypick .
881 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
882 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
884 5ef14e63 2019-06-02 stsp into the work tree.
885 5ef14e63 2019-06-02 stsp The specified
887 5ef14e63 2019-06-02 stsp must be on the same branch as the work tree's base commit.
888 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
889 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
890 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
892 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
893 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
894 5ef14e63 2019-06-02 stsp .It G Ta file was merged
895 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
896 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
897 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
898 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
899 5ef14e63 2019-06-02 stsp .It A Ta new file was added
900 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
903 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
904 5ef14e63 2019-06-02 stsp which may be viewed with
905 5ef14e63 2019-06-02 stsp .Cm got diff ,
906 5ef14e63 2019-06-02 stsp amended manually or with further
907 778a73c2 2019-07-12 stsp .Cm got backout
909 5ef14e63 2019-06-02 stsp committed with
910 5ef14e63 2019-06-02 stsp .Cm got commit ,
911 5ef14e63 2019-06-02 stsp or discarded again with
912 5ef14e63 2019-06-02 stsp .Cm got revert .
914 92228c38 2019-06-02 stsp .Cm got backout
915 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
916 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
917 92228c38 2019-06-02 stsp to a single base commit with
918 92228c38 2019-06-02 stsp .Cm got update .
919 92228c38 2019-06-02 stsp If the work tree already contains files with merge conflicts, these
920 92228c38 2019-06-02 stsp conflicts must be resolved first.
922 97b3a7be 2019-07-09 stsp Short alias for
923 97b3a7be 2019-07-09 stsp .Cm backout .
924 dfc23429 2019-08-11 stsp .It Cm rebase Oo Fl a Oc Oo Fl c Oc Op Ar branch
925 818c7501 2019-07-11 stsp Rebase commits on the specified
927 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
930 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
931 bc3056e3 2019-08-18 stsp Rebasing begins with the first descendant commit of the youngest
932 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
934 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
935 f09e2405 2019-07-11 stsp of the specified
937 f09e2405 2019-07-11 stsp has been rebased.
939 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
940 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
941 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
942 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
943 818c7501 2019-07-11 stsp .Ar branch ,
944 818c7501 2019-07-11 stsp but with different commit IDs.
945 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
946 f09e2405 2019-07-11 stsp the new version of the specified
948 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
950 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
951 818c7501 2019-07-11 stsp using the following status codes:
952 818c7501 2019-07-11 stsp .Bl -column YXZ description
953 818c7501 2019-07-11 stsp .It G Ta file was merged
954 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
955 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
956 818c7501 2019-07-11 stsp .It D Ta file was deleted
957 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
958 818c7501 2019-07-11 stsp .It A Ta new file was added
959 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
962 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
963 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
964 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
966 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
968 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
969 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
970 f09e2405 2019-07-11 stsp when the rebase operation continues.
972 818c7501 2019-07-11 stsp .Cm got rebase
973 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
974 a85446b2 2020-01-04 stsp If the work tree is not yet fully updated to the tip commit of its
975 a85446b2 2020-01-04 stsp branch then the work tree must first be updated with
976 818c7501 2019-07-11 stsp .Cm got update .
977 4ed9f614 2019-08-04 stsp If changes have been staged with
978 4ed9f614 2019-08-04 stsp .Cm got stage ,
979 bc3056e3 2019-08-18 stsp these changes must first be committed with
980 4ed9f614 2019-08-04 stsp .Cm got commit
981 4ed9f614 2019-08-04 stsp or unstaged with
982 4ed9f614 2019-08-04 stsp .Cm got unstage .
983 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
984 f09e2405 2019-07-11 stsp committed with
985 f09e2405 2019-07-11 stsp .Cm got commit
986 f09e2405 2019-07-11 stsp or reverted with
987 f09e2405 2019-07-11 stsp .Cm got revert .
990 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
991 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
994 7d5807f4 2019-07-11 stsp .Cm got update
996 7d5807f4 2019-07-11 stsp .Cm got commit
997 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
998 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
999 7d5807f4 2019-07-11 stsp conflict resolution purposes.
1001 818c7501 2019-07-11 stsp The options for
1002 818c7501 2019-07-11 stsp .Cm got rebase
1003 818c7501 2019-07-11 stsp are as follows:
1004 818c7501 2019-07-11 stsp .Bl -tag -width Ds
1006 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
1007 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1009 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
1010 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1013 818c7501 2019-07-11 stsp Short alias for
1014 818c7501 2019-07-11 stsp .Cm rebase .
1015 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
1016 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
1017 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
1019 6e54d307 2020-02-24 stsp Before starting a
1020 6e54d307 2020-02-24 stsp .Cm histedit
1021 6e54d307 2020-02-24 stsp operation the work tree's current branch must be set with
1022 6e54d307 2020-02-24 stsp .Cm got update -b
1023 6e54d307 2020-02-24 stsp to the branch which should be edited, unless this branch is already the
1024 6e54d307 2020-02-24 stsp current branch of the work tree.
1025 6e54d307 2020-02-24 stsp The tip of this branch represents the upper bound (inclusive) of commits
1026 6e54d307 2020-02-24 stsp touched by the
1027 6e54d307 2020-02-24 stsp .Cm histedit
1028 6e54d307 2020-02-24 stsp operation.
1030 6e54d307 2020-02-24 stsp Furthermore, the work tree's base commit
1031 6e54d307 2020-02-24 stsp must be set with
1032 6e54d307 2020-02-24 stsp .Cm got update -c
1033 6e54d307 2020-02-24 stsp to a point in this branch's commit history where editing should begin.
1034 6e54d307 2020-02-24 stsp This commit represents the lower bound (non-inclusive) of commits touched
1036 6e54d307 2020-02-24 stsp .Cm histedit
1037 6e54d307 2020-02-24 stsp operation.
1039 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
1040 0ebf8283 2019-07-24 stsp .Ar histedit script
1041 46fa4c83 2020-02-24 stsp which can be written in an editor based on a template, passed on the
1042 46fa4c83 2020-02-24 stsp command line, or generated with the
1044 083957f4 2020-02-24 stsp option if only log messages need to be edited.
1046 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
1047 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
1048 0ebf8283 2019-07-24 stsp whitespace and an argument.
1049 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
1050 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
1051 0ebf8283 2019-07-24 stsp Lines which begin with the
1053 0ebf8283 2019-07-24 stsp character are ignored entirely.
1055 0ebf8283 2019-07-24 stsp The available commands are as follows:
1056 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
1057 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
1058 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
1059 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
1060 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
1061 0ebf8283 2019-07-24 stsp listed further below that will be used.
1062 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
1063 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
1064 0ebf8283 2019-07-24 stsp the commit on the previous line.
1065 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
1066 0ebf8283 2019-07-24 stsp log message can be written.
1069 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
1070 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
1072 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
1073 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
1074 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
1075 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
1076 498a90b7 2019-07-25 stsp switched to it.
1078 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
1079 0ebf8283 2019-07-24 stsp using the following status codes:
1080 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
1081 0ebf8283 2019-07-24 stsp .It G Ta file was merged
1082 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
1083 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
1084 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
1085 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
1086 0ebf8283 2019-07-24 stsp .It A Ta new file was added
1087 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1090 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
1091 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
1092 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
1093 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
1095 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
1096 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
1097 0ebf8283 2019-07-24 stsp when the histedit operation continues.
1099 0ebf8283 2019-07-24 stsp .Cm got histedit
1100 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
1101 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
1102 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
1103 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
1104 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
1105 0ebf8283 2019-07-24 stsp to a single base commit with
1106 0ebf8283 2019-07-24 stsp .Cm got update .
1107 4ed9f614 2019-08-04 stsp If changes have been staged with
1108 4ed9f614 2019-08-04 stsp .Cm got stage ,
1109 bc3056e3 2019-08-18 stsp these changes must first be committed with
1110 4ed9f614 2019-08-04 stsp .Cm got commit
1111 4ed9f614 2019-08-04 stsp or unstaged with
1112 4ed9f614 2019-08-04 stsp .Cm got unstage .
1113 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
1114 0ebf8283 2019-07-24 stsp committed with
1115 0ebf8283 2019-07-24 stsp .Cm got commit
1116 0ebf8283 2019-07-24 stsp or reverted with
1117 0ebf8283 2019-07-24 stsp .Cm got revert .
1118 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
1119 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
1122 7ef62c4e 2020-02-24 stsp .Cm got update ,
1123 7ef62c4e 2020-02-24 stsp .Cm got rebase ,
1125 65db4ffb 2020-02-24 stsp .Cm got integrate
1126 65db4ffb 2020-02-24 stsp commands will refuse to run while a histedit operation is in progress.
1127 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
1128 0ebf8283 2019-07-24 stsp .Cm got commit
1129 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
1130 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
1132 0ebf8283 2019-07-24 stsp The options for
1133 0ebf8283 2019-07-24 stsp .Cm got histedit
1134 0ebf8283 2019-07-24 stsp are as follows:
1135 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
1137 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
1138 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1140 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
1141 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1142 ddbfac99 2020-02-24 stsp .It Fl F Ar histedit-script
1143 ddbfac99 2020-02-24 stsp Use the specified
1144 ddbfac99 2020-02-24 stsp .Ar histedit-script
1145 ddbfac99 2020-02-24 stsp instead of opening a temporary file in an editor where a histedit script
1146 ddbfac99 2020-02-24 stsp can be written.
1148 083957f4 2020-02-24 stsp Edit log messages only.
1149 083957f4 2020-02-24 stsp This option is a quick equivalent to a histedit script which edits
1150 2bdefe56 2020-02-24 tracey only log messages but otherwise leaves every picked commit as-is.
1153 083957f4 2020-02-24 stsp option can only be used when starting a new histedit operation.
1154 083957f4 2020-02-24 stsp If this option is used, no other command-line arguments are allowed.
1157 0ebf8283 2019-07-24 stsp Short alias for
1158 0ebf8283 2019-07-24 stsp .Cm histedit .
1159 2822a352 2019-10-15 stsp .It Cm integrate Ar branch
1160 2822a352 2019-10-15 stsp Integrate the specified
1161 2822a352 2019-10-15 stsp .Ar branch
1162 2822a352 2019-10-15 stsp into the work tree's current branch.
1163 2822a352 2019-10-15 stsp Files in the work tree are updated to match the contents on the integrated
1164 2822a352 2019-10-15 stsp .Ar branch ,
1165 2822a352 2019-10-15 stsp and the reference of the work tree's branch is changed to point at the
1166 2822a352 2019-10-15 stsp head commit of the integrated
1167 2822a352 2019-10-15 stsp .Ar branch .
1169 2822a352 2019-10-15 stsp Both branches can be considered equivalent after integration since they
1170 2822a352 2019-10-15 stsp will be pointing at the same commit.
1171 2822a352 2019-10-15 stsp Both branches remain available for future work, if desired.
1172 2822a352 2019-10-15 stsp In case the integrated
1173 2822a352 2019-10-15 stsp .Ar branch
1174 2822a352 2019-10-15 stsp is no longer needed it may be deleted with
1175 2822a352 2019-10-15 stsp .Cm got branch -d .
1177 2822a352 2019-10-15 stsp Show the status of each affected file, using the following status codes:
1178 2822a352 2019-10-15 stsp .Bl -column YXZ description
1179 2822a352 2019-10-15 stsp .It U Ta file was updated
1180 2822a352 2019-10-15 stsp .It D Ta file was deleted
1181 2822a352 2019-10-15 stsp .It A Ta new file was added
1182 2822a352 2019-10-15 stsp .It \(a~ Ta versioned file is obstructed by a non-regular file
1183 2822a352 2019-10-15 stsp .It ! Ta a missing versioned file was restored
1186 2822a352 2019-10-15 stsp .Cm got integrate
1187 2822a352 2019-10-15 stsp will refuse to run if certain preconditions are not met.
1188 2822a352 2019-10-15 stsp Most importantly, the
1189 2822a352 2019-10-15 stsp .Ar branch
1190 2822a352 2019-10-15 stsp must have been rebased onto the work tree's current branch with
1191 2822a352 2019-10-15 stsp .Cm got rebase
1192 2822a352 2019-10-15 stsp before it can be integrated, in order to linearize commit history and
1193 2822a352 2019-10-15 stsp resolve merge conflicts.
1194 2822a352 2019-10-15 stsp If the work tree contains multiple base commits it must first be updated
1195 2822a352 2019-10-15 stsp to a single base commit with
1196 2822a352 2019-10-15 stsp .Cm got update .
1197 2822a352 2019-10-15 stsp If changes have been staged with
1198 2822a352 2019-10-15 stsp .Cm got stage ,
1199 2822a352 2019-10-15 stsp these changes must first be committed with
1200 2822a352 2019-10-15 stsp .Cm got commit
1201 2822a352 2019-10-15 stsp or unstaged with
1202 2822a352 2019-10-15 stsp .Cm got unstage .
1203 2822a352 2019-10-15 stsp If the work tree contains local changes, these changes must first be
1204 2822a352 2019-10-15 stsp committed with
1205 2822a352 2019-10-15 stsp .Cm got commit
1206 2822a352 2019-10-15 stsp or reverted with
1207 2822a352 2019-10-15 stsp .Cm got revert .
1209 2822a352 2019-10-15 stsp Short alias for
1210 2822a352 2019-10-15 stsp .Cm integrate .
1211 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 ...
1212 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
1215 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
1216 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
1217 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
1218 4ed9f614 2019-08-04 stsp .Cm got status .
1220 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1221 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
1222 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
1223 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
1224 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
1227 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
1228 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
1229 9d8b19a4 2019-08-04 stsp committed.
1231 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
1232 4ed9f614 2019-08-04 stsp .Cm got commit ,
1233 4ed9f614 2019-08-04 stsp .Cm got status ,
1235 4ed9f614 2019-08-04 stsp .Cm got diff .
1236 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
1237 4ed9f614 2019-08-04 stsp .Cm got commit
1238 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
1239 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
1240 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
1242 4ed9f614 2019-08-04 stsp .Cm got status
1243 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
1245 4ed9f614 2019-08-04 stsp .Cm got diff
1246 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
1247 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
1249 4ed9f614 2019-08-04 stsp .Cm got revert
1250 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
1251 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
1253 4ed9f614 2019-08-04 stsp The options for
1254 4ed9f614 2019-08-04 stsp .Cm got stage
1255 4ed9f614 2019-08-04 stsp are as follows:
1256 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
1258 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
1259 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
1260 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
1261 1dd86744 2019-08-12 anthony among the specified paths.
1262 1dd86744 2019-08-12 anthony Otherwise, show all staged paths.
1264 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
1265 dc424a06 2019-08-07 stsp select or reject changes for staging based on
1267 6d23ec10 2019-08-08 stsp (stage change),
1269 6d23ec10 2019-08-08 stsp (reject change), and
1271 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
1272 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
1273 dc424a06 2019-08-07 stsp modified file content can be staged.
1274 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
1275 6d23ec10 2019-08-08 stsp their entirety.
1276 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
1279 3a070a2b 2019-08-07 stsp option, read
1284 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
1285 0e2f5884 2019-08-07 stsp .Ar response-script
1286 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
1289 4ed9f614 2019-08-04 stsp .Cm got stage
1290 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
1291 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
1292 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
1293 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
1294 4ed9f614 2019-08-04 stsp .Cm got update
1295 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
1296 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
1299 4ed9f614 2019-08-04 stsp .Cm got update ,
1300 4ed9f614 2019-08-04 stsp .Cm got rebase ,
1302 4ed9f614 2019-08-04 stsp .Cm got histedit
1303 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
1304 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
1305 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
1306 4ed9f614 2019-08-04 stsp .Cm got unstage
1307 4ed9f614 2019-08-04 stsp before it can be updated with
1308 4ed9f614 2019-08-04 stsp .Cm got update ,
1309 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
1311 4ed9f614 2019-08-04 stsp Short alias for
1312 4ed9f614 2019-08-04 stsp .Cm stage .
1313 dfc23429 2019-08-11 stsp .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
1314 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
1315 4ed9f614 2019-08-04 stsp back into non-staged status.
1318 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
1319 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
1321 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1322 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
1323 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
1324 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
1325 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
1326 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
1327 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
1328 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1331 2e1f37b0 2019-08-08 stsp The options for
1332 2e1f37b0 2019-08-08 stsp .Cm got unstage
1333 2e1f37b0 2019-08-08 stsp are as follows:
1334 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
1336 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
1337 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
1339 2e1f37b0 2019-08-08 stsp (unstage change),
1341 2e1f37b0 2019-08-08 stsp (keep change staged), and
1343 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
1344 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
1345 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
1346 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
1347 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
1350 2e1f37b0 2019-08-08 stsp option, read
1355 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
1356 2e1f37b0 2019-08-08 stsp .Ar response-script
1357 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
1360 4ed9f614 2019-08-04 stsp Short alias for
1361 4ed9f614 2019-08-04 stsp .Cm unstage .
1362 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 ...
1363 896e9b6f 2019-08-26 stsp Parse and print contents of objects to standard output in a line-based
1364 896e9b6f 2019-08-26 stsp text format.
1365 896e9b6f 2019-08-26 stsp Content of commit, tree, and tag objects is printed in a way similar
1366 896e9b6f 2019-08-26 stsp to the actual content stored in such objects.
1367 896e9b6f 2019-08-26 stsp Blob object contents are printed as they would appear in files on disk.
1369 896e9b6f 2019-08-26 stsp Attempt to interpret each argument as a reference, a tag name, or
1370 896e9b6f 2019-08-26 stsp an object ID SHA1 hash.
1371 01073a5d 2019-08-22 stsp References will be resolved to an object ID.
1372 01073a5d 2019-08-22 stsp Tag names will resolved to a tag object.
1373 01073a5d 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1374 01073a5d 2019-08-22 stsp automatically, provided the abbreviation is unique.
1376 896e9b6f 2019-08-26 stsp If none of the above interpretations produce a valid result, or if the
1378 896e9b6f 2019-08-26 stsp option is used, attempt to interpret the argument as a path which will
1379 896e9b6f 2019-08-26 stsp be resolved to the ID of an object found at this path in the repository.
1381 01073a5d 2019-08-22 stsp The options for
1382 01073a5d 2019-08-22 stsp .Cm got cat
1383 01073a5d 2019-08-22 stsp are as follows:
1384 01073a5d 2019-08-22 stsp .Bl -tag -width Ds
1385 896e9b6f 2019-08-26 stsp .It Fl c Ar commit
1386 896e9b6f 2019-08-26 stsp Look up paths in the specified
1387 896e9b6f 2019-08-26 stsp .Ar commit .
1388 896e9b6f 2019-08-26 stsp If this option is not used, paths are looked up in the commit resolved
1389 896e9b6f 2019-08-26 stsp via the repository's HEAD reference.
1390 896e9b6f 2019-08-26 stsp The expected argument is a commit ID SHA1 hash or an existing reference
1391 896e9b6f 2019-08-26 stsp or tag name which will be resolved to a commit ID.
1392 896e9b6f 2019-08-26 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1393 896e9b6f 2019-08-26 stsp automatically, provided the abbreviation is unique.
1394 01073a5d 2019-08-22 stsp .It Fl r Ar repository-path
1395 01073a5d 2019-08-22 stsp Use the repository at the specified path.
1396 01073a5d 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1397 01073a5d 2019-08-22 stsp working directory.
1398 01073a5d 2019-08-22 stsp If this directory is a
1400 01073a5d 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1402 896e9b6f 2019-08-26 stsp Interpret all arguments as paths only.
1403 896e9b6f 2019-08-26 stsp This option can be used to resolve ambiguity in cases where paths
1404 896e9b6f 2019-08-26 stsp look like tag names, reference names, or object IDs.
1407 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
1408 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
1409 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
1410 74416c47 2019-05-09 stsp The author's name and email address for
1411 21a44f98 2019-07-15 stsp .Cm got commit
1413 21a44f98 2019-07-15 stsp .Cm got import ,
1414 74416c47 2019-05-09 stsp for example:
1415 aba9c984 2019-09-08 stsp .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
1418 84792843 2019-08-09 stsp may fail to parse commits without an email address in author data,
1420 84792843 2019-08-09 stsp attempts to reject
1421 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
1422 84792843 2019-08-09 stsp environment variables with a missing email address.
1424 c9956ddf 2019-09-08 stsp If present, Git's
1425 aba9c984 2019-09-08 stsp .Dv user.name
1427 709ae9eb 2019-09-08 stsp .Dv user.email
1428 709ae9eb 2019-09-08 stsp configuration settings in the repository's
1429 aba9c984 2019-09-08 stsp .Pa .git/config
1430 aba9c984 2019-09-08 stsp file will override the value of
1431 aba9c984 2019-09-08 stsp .Ev GOT_AUTHOR .
1432 c9956ddf 2019-09-08 stsp However, the
1433 c9956ddf 2019-09-08 stsp .Dv user.name
1435 c9956ddf 2019-09-08 stsp .Dv user.email
1436 c9956ddf 2019-09-08 stsp configuration settings contained in Git's global
1437 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1438 c9956ddf 2019-09-08 stsp configuration file will be used only if the
1439 c9956ddf 2019-09-08 stsp .Ev GOT_AUTHOR
1440 c9956ddf 2019-09-08 stsp environment variable is
1443 1dd86744 2019-08-12 anthony .It Ev VISUAL , EDITOR
1444 23594da9 2019-05-13 stsp The editor spawned by
1445 8e7bd50a 2019-08-22 stsp .Cm got commit ,
1446 8e7bd50a 2019-08-22 stsp .Cm got import ,
1448 8e7bd50a 2019-08-22 stsp .Cm got tag .
1449 b1ebc001 2019-08-13 stsp .It Ev GOT_LOG_DEFAULT_LIMIT
1450 b1ebc001 2019-08-13 stsp The default limit on the number of commits traversed by
1451 b1ebc001 2019-08-13 stsp .Cm got log .
1452 b1ebc001 2019-08-13 stsp If set to zero, the limit is unbounded.
1453 b1ebc001 2019-08-13 stsp This variable will be silently ignored if it is set to a non-numeric value.
1455 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
1456 5c860e29 2018-03-12 stsp .Ex -std got
1457 97925469 2018-03-17 stsp .Sh EXAMPLES
1458 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
1460 fa6e0e48 2019-05-23 stsp This step currently requires
1461 fa6e0e48 2019-05-23 stsp .Xr git 1 :
1463 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
1464 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
1466 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
1468 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
1469 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
1470 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
1472 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
1473 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
1475 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
1477 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
1479 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
1481 e70c17ce 2019-05-22 stsp .Dl $ got status
1482 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
1484 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
1486 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
1488 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
1490 4e759de4 2019-06-26 stsp .Dl $ got branch -l
1492 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
1493 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
1494 d83d9d5c 2019-05-13 stsp which is forked off the
1495 d83d9d5c 2019-05-13 stsp .Dq master
1498 4e759de4 2019-06-26 stsp .Dl $ got branch unified-buffer-cache master
1500 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
1501 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
1502 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
1504 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
1506 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
1507 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
1509 fa6e0e48 2019-05-23 stsp .Dl $ got commit
1511 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
1512 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
1513 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
1515 48c8c60d 2020-01-27 stsp .Dl $ got log -p -l 3
1517 5b666081 2020-02-24 stsp In a work tree or a git repository directory, log the history of a subdirectory:
1519 5b666081 2020-02-24 stsp .Dl $ got log sys/uvm
1521 5b666081 2020-02-24 stsp While operating inside a work tree, paths are specified relative to the current
1522 5b666081 2020-02-24 stsp working directory, so this command will log the subdirectory
1523 5b666081 2020-02-24 stsp .Pa sys/uvm :
1525 5b666081 2020-02-24 stsp .Dl $ cd sys/uvm && got log '.'
1527 5b666081 2020-02-24 stsp And this command has the same effect:
1529 5b666081 2020-02-24 stsp .Dl $ cd sys/dev/usb && got log ../../uvm
1531 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
1533 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
1534 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
1536 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
1537 e70c17ce 2019-05-22 stsp with a pre-defined log message.
1539 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
1541 95fc3404 2019-07-15 stsp Update any work tree checked out from the
1542 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
1543 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
1545 95fc3404 2019-07-15 stsp .Dl $ got update
1547 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
1548 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
1549 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
1551 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1552 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
1553 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
1554 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1556 9221fb1e 2019-06-26 stsp Fetch new upstream commits into the local repository's master branch.
1557 9221fb1e 2019-06-26 stsp This step currently requires
1558 9221fb1e 2019-06-26 stsp .Xr git 1 :
1560 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
1561 fa6e0e48 2019-05-23 stsp .Dl $ git fetch origin master:master
1563 fa6e0e48 2019-05-23 stsp Rebase the
1564 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
1565 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
1566 fa6e0e48 2019-05-23 stsp .Dq master
1569 818c7501 2019-07-11 stsp .Dl $ got update -b master
1570 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
1572 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
1573 1dd86744 2019-08-12 anthony The patch can be mailed out for review and applied to
1574 1dd86744 2019-08-12 anthony .Ox Ns 's
1575 1dd86744 2019-08-12 anthony CVS tree:
1577 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
1579 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
1580 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
1583 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
1584 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
1585 0ebf8283 2019-07-24 stsp .Dl $ got histedit
1587 7b3fde24 2019-07-28 stsp Additional steps are necessary if local changes need to be pushed back
1588 7b3fde24 2019-07-28 stsp to the remote repository, which currently requires
1589 7b3fde24 2019-07-28 stsp .Cm git fetch
1591 7b3fde24 2019-07-28 stsp .Cm git push .
1592 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
1593 ff2cf171 2019-07-28 stsp .Dq git clone --bare ,
1595 ff2cf171 2019-07-28 stsp .Dq refspec
1596 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
1598 ff2cf171 2019-07-28 stsp .Dq refs/remotes
1599 ff2cf171 2019-07-28 stsp namespace of the local repository.
1600 ff2cf171 2019-07-28 stsp This can achieved by setting Git's
1601 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
1602 ff2cf171 2019-07-28 stsp configuration variable to the value
1603 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
1605 ff2cf171 2019-07-28 stsp .Cm git config
1608 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1609 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
1611 ff2cf171 2019-07-28 stsp Alternatively, the following
1613 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
1614 ff2cf171 2019-07-28 stsp .Pa config
1617 ff2cf171 2019-07-28 stsp .Dl [remote "origin"]
1618 ff2cf171 2019-07-28 stsp .Dl url = ...
1619 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
1621 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
1622 ff2cf171 2019-07-28 stsp .Dq refs/heads
1623 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
1624 ff2cf171 2019-07-28 stsp .Cm got checkout
1625 ff2cf171 2019-07-28 stsp and, if needed, created with
1626 ff2cf171 2019-07-28 stsp .Cm got branch .
1628 ff2cf171 2019-07-28 stsp Branches in the
1629 ff2cf171 2019-07-28 stsp .Dq remotes/origin
1630 ff2cf171 2019-07-28 stsp namespace can be updated with incoming changes from the remote
1631 ff2cf171 2019-07-28 stsp repository with
1632 ff2cf171 2019-07-28 stsp .Cm git fetch :
1634 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1635 ff2cf171 2019-07-28 stsp .Dl $ git fetch
1637 7b0db533 2020-02-04 stsp To make changes fetched from the remote repository appear on the
1638 ff2cf171 2019-07-28 stsp .Dq master
1639 7b0db533 2020-02-04 stsp branch, the
1640 ff2cf171 2019-07-28 stsp .Dq master
1641 ff2cf171 2019-07-28 stsp branch must be rebased onto the
1642 ff2cf171 2019-07-28 stsp .Dq origin/master
1644 7b0db533 2020-02-04 stsp This will also merge local changes, if any, with the incoming changes:
1646 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
1647 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
1650 083957f4 2020-02-24 stsp .Dq master
1651 083957f4 2020-02-24 stsp branch, log messages for local changes can now be amended with
1653 083957f4 2020-02-24 stsp by other developers and any other important new information:
1655 083957f4 2020-02-24 stsp .Dl $ got update -c origin/master
1656 083957f4 2020-02-24 stsp .Dl $ got histedit -m
1658 7b0db533 2020-02-04 stsp Local changes on the
1659 ff2cf171 2019-07-28 stsp .Dq master
1660 ff2cf171 2019-07-28 stsp branch can then be pushed to the remote
1661 ff2cf171 2019-07-28 stsp repository with
1662 ff2cf171 2019-07-28 stsp .Cm git push :
1664 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1665 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
1667 14c25ea2 2019-10-15 stsp In order to merge changes committed to the
1668 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1669 14c25ea2 2019-10-15 stsp branch back into the
1670 14c25ea2 2019-10-15 stsp .Dq master
1671 14c25ea2 2019-10-15 stsp branch, the
1672 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1673 14c25ea2 2019-10-15 stsp branch must first be rebased onto the
1674 14c25ea2 2019-10-15 stsp .Dq master
1677 14c25ea2 2019-10-15 stsp .Dl $ got update -b master
1678 14c25ea2 2019-10-15 stsp .Dl $ got rebase unified-buffer-cache
1680 14c25ea2 2019-10-15 stsp Changes on the
1681 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1682 14c25ea2 2019-10-15 stsp branch can now be made visible on the
1683 14c25ea2 2019-10-15 stsp .Dq master
1684 14c25ea2 2019-10-15 stsp branch with
1685 14c25ea2 2019-10-15 stsp .Cm got integrate .
1686 14c25ea2 2019-10-15 stsp Because the rebase operation switched the work tree to the
1687 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1688 14c25ea2 2019-10-15 stsp branch, the work tree must be switched back to the
1689 14c25ea2 2019-10-15 stsp .Dq master
1690 14c25ea2 2019-10-15 stsp branch before the
1691 14c25ea2 2019-10-15 stsp .Dq unified-buffer-cache
1692 14c25ea2 2019-10-15 stsp branch can be integrated into
1693 14c25ea2 2019-10-15 stsp .Dq master :
1695 14c25ea2 2019-10-15 stsp .Dl $ got update -b master
1696 14c25ea2 2019-10-15 stsp .Dl $ got integrate unified-buffer-cache
1697 5c860e29 2018-03-12 stsp .Sh SEE ALSO
1698 2312fc47 2019-07-15 stsp .Xr tog 1 ,
1699 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
1700 285dc8a4 2018-03-13 stsp .Xr got-worktree 5
1701 1a208aaf 2018-04-01 stsp .Sh AUTHORS
1702 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
1703 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
1704 bc3056e3 2019-08-18 stsp .An Joshua Stein Aq Mt jcs@openbsd.org
1705 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
1707 fa6e0e48 2019-05-23 stsp is a work-in-progress and many commands remain to be implemented.
1708 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
1710 ff2cf171 2019-07-28 stsp to perform many tasks, in particular tasks related to repository
1711 ff2cf171 2019-07-28 stsp administration and tasks which require a network connection.
