2 5c860e29 2018-03-12 stsp .\" Copyright (c) 2017 Martin Pieuchot
3 5d56da81 2019-01-13 stsp .\" Copyright (c) 2018, 2019 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.
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 21a44f98 2019-07-15 stsp environment variable to be set.
95 3ce1b845 2019-07-15 stsp The options for
96 3ce1b845 2019-07-15 stsp .Cm got import
97 3ce1b845 2019-07-15 stsp are as follows:
98 3ce1b845 2019-07-15 stsp .Bl -tag -width Ds
99 3ce1b845 2019-07-15 stsp .It Fl b Ar branch
100 3ce1b845 2019-07-15 stsp Create the specified
102 3ce1b845 2019-07-15 stsp instead of creating the default branch
103 3ce1b845 2019-07-15 stsp .Dq master .
104 3ce1b845 2019-07-15 stsp Use of this option is required if the
106 3ce1b845 2019-07-15 stsp branch already exists.
107 3ce1b845 2019-07-15 stsp .It Fl m Ar message
108 3ce1b845 2019-07-15 stsp Use the specified log message when creating the new commit.
109 3ce1b845 2019-07-15 stsp Without the
112 3ce1b845 2019-07-15 stsp .Cm got import
113 3ce1b845 2019-07-15 stsp opens a temporary file in an editor where a log message can be written.
114 3ce1b845 2019-07-15 stsp .It Fl r Ar repository-path
115 3ce1b845 2019-07-15 stsp Use the repository at the specified path.
116 3ce1b845 2019-07-15 stsp If not specified, assume the repository is located at or above the current
117 3ce1b845 2019-07-15 stsp working directory.
118 3ce1b845 2019-07-15 stsp .It Fl I Ar pattern
119 3ce1b845 2019-07-15 stsp Ignore files or directories with a name which matches the specified
120 3ce1b845 2019-07-15 stsp .Ar pattern .
121 3ce1b845 2019-07-15 stsp This option may be specified multiple times to build a list of ignore patterns.
123 3ce1b845 2019-07-15 stsp .Ar pattern
124 3ce1b845 2019-07-15 stsp follows the globbing rules documented in
125 3ce1b845 2019-07-15 stsp .Xr glob 7 .
128 bc26cce8 2019-08-04 stsp Short alias for
129 bc26cce8 2019-08-04 stsp .Cm import .
130 dfc23429 2019-08-11 stsp .It Cm checkout 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
131 0bb8a95e 2018-03-12 stsp Copy files from a repository into a new work tree.
133 5d7c1dab 2018-04-01 stsp .Ar work tree path
134 c844a238 2019-02-06 stsp is not specified, either use the last component of
135 5d7c1dab 2018-04-01 stsp .Ar repository path ,
137 5d7c1dab 2018-04-01 stsp .Ar path prefix
138 c844a238 2019-02-06 stsp was specified use the last component of
139 5d7c1dab 2018-04-01 stsp .Ar path prefix .
141 38e11793 2018-06-13 stsp The options for
142 38e11793 2018-06-13 stsp .Cm got checkout
143 38e11793 2018-06-13 stsp are as follows:
144 38e11793 2018-06-13 stsp .Bl -tag -width Ds
145 08573d5b 2019-05-14 stsp .It Fl b Ar branch
146 3c575567 2019-07-28 stsp Check out files from a commit on the specified
147 08573d5b 2019-05-14 stsp .Ar branch .
148 08573d5b 2019-05-14 stsp If this option is not specified, a branch resolved via the repository's HEAD
149 08573d5b 2019-05-14 stsp reference will be used.
150 8069f636 2019-01-12 stsp .It Fl c Ar commit
151 8069f636 2019-01-12 stsp Check out files from the specified
153 3c575567 2019-07-28 stsp on the selected branch.
154 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
155 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
156 0e1b0230 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
157 0e1b0230 2019-07-07 stsp automatically, provided the abbreviation is unique.
158 08573d5b 2019-05-14 stsp If this option is not specified, the most recent commit on the selected
159 08573d5b 2019-05-14 stsp branch will be used.
160 38e11793 2018-06-13 stsp .It Fl p Ar path-prefix
161 38e11793 2018-06-13 stsp Restrict the work tree to a subset of the repository's tree hierarchy.
162 38e11793 2018-06-13 stsp Only files beneath the specified
163 38e11793 2018-06-13 stsp .Ar path-prefix
164 38e11793 2018-06-13 stsp will be checked out.
167 97b3a7be 2019-07-09 stsp Short alias for
168 97b3a7be 2019-07-09 stsp .Cm checkout .
169 dfc23429 2019-08-11 stsp .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Op Ar path ...
170 024e9686 2019-05-14 stsp Update an existing work tree to a different commit.
171 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
172 7f838b36 2019-02-08 stsp .Bl -column YXZ description
173 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
174 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
175 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
176 7f838b36 2019-02-08 stsp .It D Ta file was deleted
177 7f838b36 2019-02-08 stsp .It A Ta new file was added
178 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
179 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
184 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
185 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
186 f2ea84fa 2019-07-27 stsp specified paths.
187 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
188 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
189 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
192 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
193 c4cdcb68 2019-04-03 stsp multiple base commits.
194 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
195 47ec7be7 2019-05-12 stsp .Cm got update
196 47ec7be7 2019-05-12 stsp across the entire work tree.
197 024e9686 2019-05-14 stsp Specifying a
199 024e9686 2019-05-14 stsp is incompatible with the
203 4ed9f614 2019-08-04 stsp .Cm got update
204 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
205 4ed9f614 2019-08-04 stsp If changes have been staged with
206 4ed9f614 2019-08-04 stsp .Cm got stage ,
207 bc3056e3 2019-08-18 stsp these changes must first be committed with
208 4ed9f614 2019-08-04 stsp .Cm got commit
209 4ed9f614 2019-08-04 stsp or unstaged with
210 4ed9f614 2019-08-04 stsp .Cm got unstage .
212 507dc3bb 2018-12-29 stsp The options for
213 507dc3bb 2018-12-29 stsp .Cm got update
214 507dc3bb 2018-12-29 stsp are as follows:
215 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
216 024e9686 2019-05-14 stsp .It Fl b Ar branch
217 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
219 024e9686 2019-05-14 stsp before updating the work tree.
220 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
221 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
222 507dc3bb 2018-12-29 stsp Update the work tree to the specified
223 507dc3bb 2018-12-29 stsp .Ar commit .
224 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
225 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
226 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
227 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
228 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
229 024e9686 2019-05-14 stsp branch will be used.
232 97b3a7be 2019-07-09 stsp Short alias for
233 97b3a7be 2019-07-09 stsp .Cm update .
234 dfc23429 2019-08-11 stsp .It Cm status Op Ar path ...
235 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
236 6bad629b 2019-02-04 stsp using the following status codes:
237 6bad629b 2019-02-04 stsp .Bl -column YXZ description
238 6bad629b 2019-02-04 stsp .It M Ta modified file
239 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
240 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
241 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
242 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
243 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
244 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
246 2a06fe5f 2019-08-24 stsp .It N Ta non-existent
248 2a06fe5f 2019-08-24 stsp specified on the command line
253 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
254 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
256 4ed9f614 2019-08-04 stsp If changes have been staged with
257 4ed9f614 2019-08-04 stsp .Cm got stage ,
258 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
259 4ed9f614 2019-08-04 stsp status codes:
260 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
261 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
262 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
263 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
266 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
267 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
268 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
269 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
272 6841da00 2019-08-08 stsp For compatibility with
273 6841da00 2019-08-08 stsp .Xr cvs 1 ,
274 6841da00 2019-08-08 stsp .Cm got status
276 6841da00 2019-08-08 stsp .Pa .cvsignore
277 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
278 6841da00 2019-08-08 stsp which match
280 6841da00 2019-08-08 stsp ignore patterns contained in
281 6841da00 2019-08-08 stsp .Pa .cvsignore
284 6841da00 2019-08-08 stsp .Xr cvs 1 ,
285 6841da00 2019-08-08 stsp .Cm got status
286 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
288 97b3a7be 2019-07-09 stsp Short alias for
289 97b3a7be 2019-07-09 stsp .Cm status .
290 dfc23429 2019-08-11 stsp .It Cm log Oo Fl c Ar commit Oc Oo Fl C Ar number Oc Oo Fl f Oc Oo Fl l Ar N Oc Oo Fl p Oc Oo Fl r Ar repository-path Oc Op Ar path
291 38e11793 2018-06-13 stsp Display history of a repository.
294 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
296 38e11793 2018-06-13 stsp The options for
297 38e11793 2018-06-13 stsp .Cm got log
298 38e11793 2018-06-13 stsp are as follows:
299 38e11793 2018-06-13 stsp .Bl -tag -width Ds
300 38e11793 2018-06-13 stsp .It Fl c Ar commit
301 38e11793 2018-06-13 stsp Start traversing history at the specified
302 38e11793 2018-06-13 stsp .Ar commit .
303 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
304 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
305 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
306 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
307 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
308 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
309 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
310 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
312 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
314 cc54c501 2019-07-15 stsp Restrict history traversal to the first parent of each commit.
315 cc54c501 2019-07-15 stsp This shows the linear history of the current branch only.
316 cc54c501 2019-07-15 stsp Merge commits which affected the current branch will be shown but
317 cc54c501 2019-07-15 stsp individual commits which originated on other branches will be omitted.
318 6238ee32 2018-06-13 stsp .It Fl l Ar N
319 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
320 b1ebc001 2019-08-13 stsp If this option is not specified, a default limit value of zero is used,
321 b1ebc001 2019-08-13 stsp which is treated as an unbounded limit.
323 b1ebc001 2019-08-13 stsp .Ev GOT_LOG_DEFAULT_LIMIT
324 b1ebc001 2019-08-13 stsp environment variable may be set to change this default value.
326 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
329 44392932 2019-08-25 stsp is specified, only show the patch of modifications at or within this path.
330 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
331 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
332 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
333 04ca23f4 2018-07-16 stsp working directory.
334 e9cf2e30 2019-02-05 stsp If this directory is a
336 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
338 dfc23429 2019-08-11 stsp .It Cm diff Oo Fl C Ar number Oc Oo Fl r Ar repository-path Oc Oo Fl s Oc Op Ar object1 Ar object2 | Ar path
339 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
340 927df6b7 2019-02-10 stsp uncommitted changes in the work tree.
343 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
345 d24820bf 2019-08-11 stsp If two arguments are provided, treat each argument as a reference, a tag
346 d24820bf 2019-08-11 stsp name, or an object ID SHA1 hash, and display differences between the
347 d24820bf 2019-08-11 stsp corresponding objects.
348 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
349 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
350 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
352 c0cc5c62 2018-10-18 stsp The options for
353 c0cc5c62 2018-10-18 stsp .Cm got diff
354 c0cc5c62 2018-10-18 stsp are as follows:
355 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
356 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
357 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
358 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
359 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
360 b72f483a 2019-02-05 stsp Use the repository at the specified path.
361 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
362 b72f483a 2019-02-05 stsp working directory.
363 b72f483a 2019-02-05 stsp If this directory is a
365 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
367 4ed9f614 2019-08-04 stsp Show changes staged with
368 4ed9f614 2019-08-04 stsp .Cm got stage
369 4ed9f614 2019-08-04 stsp instead of showing local changes.
370 4ed9f614 2019-08-04 stsp This option is only valid when
371 4ed9f614 2019-08-04 stsp .Cm got diff
372 4ed9f614 2019-08-04 stsp is invoked in a work tree.
375 bc26cce8 2019-08-04 stsp Short alias for
377 dfc23429 2019-08-11 stsp .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
378 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
380 1ff8e573 2018-08-02 stsp The options for
381 1ff8e573 2018-08-02 stsp .Cm got blame
382 1ff8e573 2018-08-02 stsp are as follows:
383 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
384 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
385 1ff8e573 2018-08-02 stsp Start traversing history at the specified
386 1ff8e573 2018-08-02 stsp .Ar commit .
387 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
388 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
389 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
390 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
391 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
392 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
393 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
394 1ff8e573 2018-08-02 stsp working directory.
395 0c06baac 2019-02-05 stsp If this directory is a
397 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
400 bc26cce8 2019-08-04 stsp Short alias for
401 bc26cce8 2019-08-04 stsp .Cm blame .
402 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
403 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
404 5de5890b 2018-10-18 stsp directory path in the repository.
405 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
406 db0c2996 2019-02-10 stsp annotations:
407 db0c2996 2019-02-10 stsp .Bl -column YXZ description
408 848d6979 2019-08-12 stsp .It @ Ta entry is a symbolic link
409 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
410 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
411 63c5ca5d 2019-08-24 stsp .It $ Ta entry is a Git submodule
416 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
417 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
418 0c849583 2019-02-05 stsp if there is no work tree.
420 5de5890b 2018-10-18 stsp The options for
421 5de5890b 2018-10-18 stsp .Cm got tree
422 5de5890b 2018-10-18 stsp are as follows:
423 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
424 5de5890b 2018-10-18 stsp .It Fl c Ar commit
425 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
426 5de5890b 2018-10-18 stsp .Ar commit .
427 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
428 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
429 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
430 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
431 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
432 5de5890b 2018-10-18 stsp Use the repository at the specified path.
433 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
434 5de5890b 2018-10-18 stsp working directory.
435 0c849583 2019-02-05 stsp If this directory is a
437 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
439 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
441 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
444 bc26cce8 2019-08-04 stsp Short alias for
446 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
447 d0eebce4 2019-03-11 stsp Manage references in a repository.
449 d0eebce4 2019-03-11 stsp If no options are passed, expect two arguments and attempt to create,
450 d0eebce4 2019-03-11 stsp or update, the reference with the given
452 d0eebce4 2019-03-11 stsp and make it point at the given
453 d83d9d5c 2019-05-13 stsp .Ar target .
454 a54b6686 2019-06-28 stsp The target may be an object ID SHA1 hash or an existing reference which
455 a54b6686 2019-06-28 stsp will be resolved to an object ID.
456 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
457 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
459 d0eebce4 2019-03-11 stsp The options for
460 d0eebce4 2019-03-11 stsp .Cm got ref
461 d0eebce4 2019-03-11 stsp are as follows:
462 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
463 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
464 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
465 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
466 d0eebce4 2019-03-11 stsp working directory.
467 d0eebce4 2019-03-11 stsp If this directory is a
469 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
471 d0eebce4 2019-03-11 stsp List all existing references in the repository.
472 d0eebce4 2019-03-11 stsp .It Fl d Ar name
473 d0eebce4 2019-03-11 stsp Delete the reference with the specified name from the repository.
475 d1c1ae5f 2019-08-12 stsp Create a symbolic reference pointing at the specified
476 d1c1ae5f 2019-08-12 stsp .Ar target ,
477 d1c1ae5f 2019-08-12 stsp which must be an existing reference.
478 d1c1ae5f 2019-08-12 stsp Care should be taken not to create loops between references when
479 d1c1ae5f 2019-08-12 stsp this option is used.
481 a4f89d48 2019-08-25 stsp .It Cm branch Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl d Ar name Oc Op Ar name Op Ar commit
482 4e759de4 2019-06-26 stsp Manage branches in a repository.
484 4e759de4 2019-06-26 stsp Branches are managed via references which live in the
485 4e759de4 2019-06-26 stsp .Dq refs/heads/
486 4e759de4 2019-06-26 stsp reference namespace.
488 4e759de4 2019-06-26 stsp .Cm got branch
489 4e759de4 2019-06-26 stsp command operates on references in this namespace only.
491 4e759de4 2019-06-26 stsp If no options are passed, expect one or two arguments and attempt to create
492 a4f89d48 2019-08-25 stsp a branch reference with the given
494 4e759de4 2019-06-26 stsp and make it point at the given
495 a4f89d48 2019-08-25 stsp .Ar commit .
496 a4f89d48 2019-08-25 stsp The expected
498 a4f89d48 2019-08-25 stsp argument is a commit ID SHA1 hash or an existing reference
499 a4f89d48 2019-08-25 stsp or tag name which will be resolved to a commit ID.
502 a4f89d48 2019-08-25 stsp is specified, default to the latest commit on the work tree's current
503 a4f89d48 2019-08-25 stsp branch if invoked in a work tree, or to a commit resolved via the
504 a4f89d48 2019-08-25 stsp repository's HEAD reference.
506 4e759de4 2019-06-26 stsp The options for
507 4e759de4 2019-06-26 stsp .Cm got branch
508 4e759de4 2019-06-26 stsp are as follows:
509 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
510 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
511 4e759de4 2019-06-26 stsp Use the repository at the specified path.
512 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
513 4e759de4 2019-06-26 stsp working directory.
514 4e759de4 2019-06-26 stsp If this directory is a
516 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
518 4e759de4 2019-06-26 stsp List all existing branches in the repository.
519 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
520 ba882ee3 2019-07-11 stsp with one the following annotations:
521 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
522 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
523 1dd86744 2019-08-12 anthony .It \(a~ Ta work tree's base commit is out-of-date
525 4e759de4 2019-06-26 stsp .It Fl d Ar name
526 4e759de4 2019-06-26 stsp Delete the branch with the specified name from the repository.
527 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
528 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
529 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
530 ce33d90e 2019-07-14 stsp Git's garbage collector.
533 97b3a7be 2019-07-09 stsp Short alias for
534 97b3a7be 2019-07-09 stsp .Cm branch .
535 8e7bd50a 2019-08-22 stsp .It Cm tag Oo Fl m Ar message Oc Oo Fl r Ar repository-path Oc Oo Fl l Oc Ar name Op Ar commit Oc
536 8e7bd50a 2019-08-22 stsp Manage tags in a repository.
538 8e7bd50a 2019-08-22 stsp Tags are managed via references which live in the
539 8e7bd50a 2019-08-22 stsp .Dq refs/tags/
540 8e7bd50a 2019-08-22 stsp reference namespace.
542 8e7bd50a 2019-08-22 stsp .Cm got tag
543 8e7bd50a 2019-08-22 stsp command operates on references in this namespace only.
544 b3cd068e 2019-08-22 stsp References in this namespace point at tag objects which contain a pointer
545 b3cd068e 2019-08-22 stsp to another object, a tag message, as well as author and timestamp information.
547 8e7bd50a 2019-08-22 stsp Expect one or two arguments and attempt to create a tag with the given
549 8e7bd50a 2019-08-22 stsp and make this tag point at the given
550 8e7bd50a 2019-08-22 stsp .Ar commit .
551 8e7bd50a 2019-08-22 stsp If no commit is specified, default to the latest commit on the work tree's
552 8e7bd50a 2019-08-22 stsp current branch if invoked in a work tree, and to a commit resolved via
553 8e7bd50a 2019-08-22 stsp the repository's HEAD reference otherwise.
554 8e7bd50a 2019-08-22 stsp Otherwise, the expected argument is a commit ID SHA1 hash or an existing
555 8e7bd50a 2019-08-22 stsp reference or tag name which will be resolved to a commit ID.
556 8e7bd50a 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
557 8e7bd50a 2019-08-22 stsp automatically, provided the abbreviation is unique.
559 8e7bd50a 2019-08-22 stsp The options for
560 8e7bd50a 2019-08-22 stsp .Cm got tag
561 8e7bd50a 2019-08-22 stsp are as follows:
562 8e7bd50a 2019-08-22 stsp .Bl -tag -width Ds
563 8e7bd50a 2019-08-22 stsp .It Fl m Ar message
564 8e7bd50a 2019-08-22 stsp Use the specified tag message when creating the new tag
565 8e7bd50a 2019-08-22 stsp Without the
568 8e7bd50a 2019-08-22 stsp .Cm got import
569 8e7bd50a 2019-08-22 stsp opens a temporary file in an editor where a tag message can be written.
570 8e7bd50a 2019-08-22 stsp .It Fl r Ar repository-path
571 8e7bd50a 2019-08-22 stsp Use the repository at the specified path.
572 8e7bd50a 2019-08-22 stsp If not specified, assume the repository is located at or above the current
573 8e7bd50a 2019-08-22 stsp working directory.
574 8e7bd50a 2019-08-22 stsp If this directory is a
576 8e7bd50a 2019-08-22 stsp work tree, use the repository path associated with this work tree.
578 8e7bd50a 2019-08-22 stsp List all existing tags in the repository instead of creating a new tag.
579 8e7bd50a 2019-08-22 stsp If this option is used, no other command-line arguments are allowed.
582 8e7bd50a 2019-08-22 stsp By design, the
583 8e7bd50a 2019-08-22 stsp .Cm got tag
584 8e7bd50a 2019-08-22 stsp command will not delete tags or change existing tags.
585 8e7bd50a 2019-08-22 stsp If a tag must be deleted, the
586 8e7bd50a 2019-08-22 stsp .Cm got ref
587 8e7bd50a 2019-08-22 stsp command may be used to delete a tag's reference.
588 8e7bd50a 2019-08-22 stsp This should only be done if the tag has not already been copied to
589 8e7bd50a 2019-08-22 stsp another repository.
590 fbb7e5c7 2019-05-11 stsp .It Cm add Ar file-path ...
591 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
592 d00136be 2019-03-26 stsp repository in the next commit.
593 648e4ef7 2019-07-09 stsp .It Cm remove Ar file-path ...
594 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
595 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
597 2ec1f75b 2019-03-26 stsp The options for
598 86d25a1b 2019-07-11 stsp .Cm got remove
599 2ec1f75b 2019-03-26 stsp are as follows:
600 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
602 17ed4618 2019-06-02 stsp Perform the operation even if a file contains uncommitted modifications.
605 648e4ef7 2019-07-09 stsp Short alias for
606 648e4ef7 2019-07-09 stsp .Cm remove .
607 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 ...
608 bc3056e3 2019-08-18 stsp Revert any uncommitted changes in files at the specified paths.
609 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
610 1dd86744 2019-08-12 anthony work tree's base commit.
611 1dd86744 2019-08-12 anthony There is no way to bring discarded changes back after
612 a129376b 2019-03-28 stsp .Cm got revert !
614 e20a8b6f 2019-06-04 stsp If a file was added with
615 a129376b 2019-03-28 stsp .Cm got add
616 a129376b 2019-03-28 stsp it will become an unversioned file again.
617 e20a8b6f 2019-06-04 stsp If a file was deleted with
618 86d25a1b 2019-07-11 stsp .Cm got remove
619 a129376b 2019-03-28 stsp it will be restored.
621 0f6d7415 2019-08-08 stsp The options for
622 0f6d7415 2019-08-08 stsp .Cm got revert
623 0f6d7415 2019-08-08 stsp are as follows:
624 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
626 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
627 33aa809d 2019-08-08 stsp changes to revert based on
629 33aa809d 2019-08-08 stsp (revert change),
631 33aa809d 2019-08-08 stsp (keep change), and
633 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
634 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
635 33aa809d 2019-08-08 stsp modified file content can be reverted.
636 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
637 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
640 33aa809d 2019-08-08 stsp option, read
645 33aa809d 2019-08-08 stsp responses line-by-line from the specified
646 33aa809d 2019-08-08 stsp .Ar response-script
647 33aa809d 2019-08-08 stsp file instead of prompting interactively.
649 0f6d7415 2019-08-08 stsp Permit recursion into directories.
650 0f6d7415 2019-08-08 stsp If this option is not specified,
651 0f6d7415 2019-08-08 stsp .Cm got revert
652 0f6d7415 2019-08-08 stsp will refuse to run if a specified
654 0f6d7415 2019-08-08 stsp is a directory.
657 97b3a7be 2019-07-09 stsp Short alias for
658 97b3a7be 2019-07-09 stsp .Cm revert .
659 dfc23429 2019-08-11 stsp .It Cm commit Oo Fl m Ar message Oc Op Ar path ...
660 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
661 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
664 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
665 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
667 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
668 1dd86744 2019-08-12 anthony .Cm got stage ,
669 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
670 4ed9f614 2019-08-04 stsp have not been staged.
672 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
673 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
674 15cd91f7 2019-05-12 stsp .It M Ta modified file
675 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
676 15cd91f7 2019-05-12 stsp .It A Ta new file was added
679 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
680 996d5ccd 2019-08-05 stsp recorded base commit.
683 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
684 15cd91f7 2019-05-12 stsp multiple base commits.
685 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
686 47ec7be7 2019-05-12 stsp .Cm got update
687 47ec7be7 2019-05-12 stsp across the entire work tree.
690 15cd91f7 2019-05-12 stsp .Cm got commit
691 15cd91f7 2019-05-12 stsp command requires the
692 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
693 74416c47 2019-05-09 stsp environment variable to be set.
695 74416c47 2019-05-09 stsp The options for
696 74416c47 2019-05-09 stsp .Cm got commit
697 74416c47 2019-05-09 stsp are as follows:
698 74416c47 2019-05-09 stsp .Bl -tag -width Ds
699 74ff3f23 2019-07-07 stsp .It Fl m Ar message
700 74416c47 2019-05-09 stsp Use the specified log message when creating the new commit.
701 23594da9 2019-05-13 stsp Without the
704 23594da9 2019-05-13 stsp .Cm got commit
705 23594da9 2019-05-13 stsp opens a temporary file in an editor where a log message can be written.
708 cfce0458 2019-07-28 stsp .Cm got commit
709 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
710 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
711 916f288c 2019-07-30 stsp .Dq refs/heads/
712 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
713 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
714 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
715 cfce0458 2019-07-28 stsp If a path is found to be out of date,
716 cfce0458 2019-07-28 stsp .Cm got update
717 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
718 cfce0458 2019-07-28 stsp in the repository.
720 97b3a7be 2019-07-09 stsp Short alias for
721 97b3a7be 2019-07-09 stsp .Cm commit .
722 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
723 234035bc 2019-06-01 stsp Merge changes from a single
725 234035bc 2019-06-01 stsp into the work tree.
726 234035bc 2019-06-01 stsp The specified
728 234035bc 2019-06-01 stsp must be on a different branch than the work tree's base commit.
729 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
730 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
731 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
733 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
734 234035bc 2019-06-01 stsp .Bl -column YXZ description
735 234035bc 2019-06-01 stsp .It G Ta file was merged
736 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
737 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
738 234035bc 2019-06-01 stsp .It D Ta file was deleted
739 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
740 234035bc 2019-06-01 stsp .It A Ta new file was added
741 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
744 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
745 234035bc 2019-06-01 stsp may be viewed with
746 234035bc 2019-06-01 stsp .Cm got diff ,
747 234035bc 2019-06-01 stsp amended manually or with further
748 234035bc 2019-06-01 stsp .Cm got cherrypick
750 234035bc 2019-06-01 stsp committed with
751 234035bc 2019-06-01 stsp .Cm got commit ,
752 234035bc 2019-06-01 stsp or discarded again with
753 234035bc 2019-06-01 stsp .Cm got revert .
755 234035bc 2019-06-01 stsp .Cm got cherrypick
756 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
757 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
758 234035bc 2019-06-01 stsp to a single base commit with
759 234035bc 2019-06-01 stsp .Cm got update .
760 234035bc 2019-06-01 stsp If the work tree already contains files with merge conflicts, these
761 234035bc 2019-06-01 stsp conflicts must be resolved first.
763 97b3a7be 2019-07-09 stsp Short alias for
764 97b3a7be 2019-07-09 stsp .Cm cherrypick .
765 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
766 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
768 5ef14e63 2019-06-02 stsp into the work tree.
769 5ef14e63 2019-06-02 stsp The specified
771 5ef14e63 2019-06-02 stsp must be on the same branch as the work tree's base commit.
772 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
773 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
774 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
776 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
777 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
778 5ef14e63 2019-06-02 stsp .It G Ta file was merged
779 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
780 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
781 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
782 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
783 5ef14e63 2019-06-02 stsp .It A Ta new file was added
784 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
787 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
788 5ef14e63 2019-06-02 stsp which may be viewed with
789 5ef14e63 2019-06-02 stsp .Cm got diff ,
790 5ef14e63 2019-06-02 stsp amended manually or with further
791 778a73c2 2019-07-12 stsp .Cm got backout
793 5ef14e63 2019-06-02 stsp committed with
794 5ef14e63 2019-06-02 stsp .Cm got commit ,
795 5ef14e63 2019-06-02 stsp or discarded again with
796 5ef14e63 2019-06-02 stsp .Cm got revert .
798 92228c38 2019-06-02 stsp .Cm got backout
799 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
800 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
801 92228c38 2019-06-02 stsp to a single base commit with
802 92228c38 2019-06-02 stsp .Cm got update .
803 92228c38 2019-06-02 stsp If the work tree already contains files with merge conflicts, these
804 92228c38 2019-06-02 stsp conflicts must be resolved first.
806 97b3a7be 2019-07-09 stsp Short alias for
807 97b3a7be 2019-07-09 stsp .Cm backout .
808 dfc23429 2019-08-11 stsp .It Cm rebase Oo Fl a Oc Oo Fl c Oc Op Ar branch
809 818c7501 2019-07-11 stsp Rebase commits on the specified
811 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
814 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
815 bc3056e3 2019-08-18 stsp Rebasing begins with the first descendant commit of the youngest
816 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
818 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
819 f09e2405 2019-07-11 stsp of the specified
821 f09e2405 2019-07-11 stsp has been rebased.
823 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
824 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
825 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
826 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
827 818c7501 2019-07-11 stsp .Ar branch ,
828 818c7501 2019-07-11 stsp but with different commit IDs.
829 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
830 f09e2405 2019-07-11 stsp the new version of the specified
832 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
834 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
835 818c7501 2019-07-11 stsp using the following status codes:
836 818c7501 2019-07-11 stsp .Bl -column YXZ description
837 818c7501 2019-07-11 stsp .It G Ta file was merged
838 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
839 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
840 818c7501 2019-07-11 stsp .It D Ta file was deleted
841 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
842 818c7501 2019-07-11 stsp .It A Ta new file was added
843 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
846 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
847 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
848 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
850 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
852 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
853 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
854 f09e2405 2019-07-11 stsp when the rebase operation continues.
856 818c7501 2019-07-11 stsp .Cm got rebase
857 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
858 818c7501 2019-07-11 stsp If the work tree contains multiple base commits it must first be updated
859 818c7501 2019-07-11 stsp to a single base commit with
860 818c7501 2019-07-11 stsp .Cm got update .
861 4ed9f614 2019-08-04 stsp If changes have been staged with
862 4ed9f614 2019-08-04 stsp .Cm got stage ,
863 bc3056e3 2019-08-18 stsp these changes must first be committed with
864 4ed9f614 2019-08-04 stsp .Cm got commit
865 4ed9f614 2019-08-04 stsp or unstaged with
866 4ed9f614 2019-08-04 stsp .Cm got unstage .
867 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
868 f09e2405 2019-07-11 stsp committed with
869 f09e2405 2019-07-11 stsp .Cm got commit
870 f09e2405 2019-07-11 stsp or reverted with
871 f09e2405 2019-07-11 stsp .Cm got revert .
874 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
875 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
878 7d5807f4 2019-07-11 stsp .Cm got update
880 7d5807f4 2019-07-11 stsp .Cm got commit
881 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
882 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
883 7d5807f4 2019-07-11 stsp conflict resolution purposes.
885 818c7501 2019-07-11 stsp The options for
886 818c7501 2019-07-11 stsp .Cm got rebase
887 818c7501 2019-07-11 stsp are as follows:
888 818c7501 2019-07-11 stsp .Bl -tag -width Ds
890 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
891 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
893 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
894 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
897 818c7501 2019-07-11 stsp Short alias for
898 818c7501 2019-07-11 stsp .Cm rebase .
899 dfc23429 2019-08-11 stsp .It Cm histedit Oo Fl a Oc Oo Fl c Oc Op Fl F Ar histedit-script
900 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
901 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
903 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
904 0ebf8283 2019-07-24 stsp .Ar histedit script
905 0ebf8283 2019-07-24 stsp which can be edited interactively or passed on the command line.
906 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
907 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
908 0ebf8283 2019-07-24 stsp whitespace and an argument.
909 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
910 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
911 0ebf8283 2019-07-24 stsp Lines which begin with the
913 0ebf8283 2019-07-24 stsp character are ignored entirely.
915 0ebf8283 2019-07-24 stsp The available commands are as follows:
916 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
917 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
918 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
919 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
920 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
921 0ebf8283 2019-07-24 stsp listed further below that will be used.
922 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
923 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
924 0ebf8283 2019-07-24 stsp the commit on the previous line.
925 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
926 0ebf8283 2019-07-24 stsp log message can be written.
929 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
930 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
932 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
933 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
934 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
935 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
936 498a90b7 2019-07-25 stsp switched to it.
938 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
939 0ebf8283 2019-07-24 stsp using the following status codes:
940 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
941 0ebf8283 2019-07-24 stsp .It G Ta file was merged
942 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
943 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
944 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
945 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
946 0ebf8283 2019-07-24 stsp .It A Ta new file was added
947 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
950 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
951 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
952 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
953 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
955 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
956 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
957 0ebf8283 2019-07-24 stsp when the histedit operation continues.
959 0ebf8283 2019-07-24 stsp .Cm got histedit
960 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
961 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
962 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
963 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
964 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
965 0ebf8283 2019-07-24 stsp to a single base commit with
966 0ebf8283 2019-07-24 stsp .Cm got update .
967 4ed9f614 2019-08-04 stsp If changes have been staged with
968 4ed9f614 2019-08-04 stsp .Cm got stage ,
969 bc3056e3 2019-08-18 stsp these changes must first be committed with
970 4ed9f614 2019-08-04 stsp .Cm got commit
971 4ed9f614 2019-08-04 stsp or unstaged with
972 4ed9f614 2019-08-04 stsp .Cm got unstage .
973 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
974 0ebf8283 2019-07-24 stsp committed with
975 0ebf8283 2019-07-24 stsp .Cm got commit
976 0ebf8283 2019-07-24 stsp or reverted with
977 0ebf8283 2019-07-24 stsp .Cm got revert .
978 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
979 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
982 0ebf8283 2019-07-24 stsp .Cm got update
983 a698f62e 2019-07-25 stsp command will refuse to run while a histedit operation is in progress.
984 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
985 0ebf8283 2019-07-24 stsp .Cm got commit
986 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
987 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
989 0ebf8283 2019-07-24 stsp The options for
990 0ebf8283 2019-07-24 stsp .Cm got histedit
991 0ebf8283 2019-07-24 stsp are as follows:
992 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
994 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
995 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
997 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
998 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1001 0ebf8283 2019-07-24 stsp Short alias for
1002 0ebf8283 2019-07-24 stsp .Cm histedit .
1003 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 ...
1004 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
1007 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
1008 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
1009 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
1010 4ed9f614 2019-08-04 stsp .Cm got status .
1012 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1013 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
1014 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
1015 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
1016 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
1019 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
1020 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
1021 9d8b19a4 2019-08-04 stsp committed.
1023 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
1024 4ed9f614 2019-08-04 stsp .Cm got commit ,
1025 4ed9f614 2019-08-04 stsp .Cm got status ,
1027 4ed9f614 2019-08-04 stsp .Cm got diff .
1028 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
1029 4ed9f614 2019-08-04 stsp .Cm got commit
1030 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
1031 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
1032 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
1034 4ed9f614 2019-08-04 stsp .Cm got status
1035 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
1037 4ed9f614 2019-08-04 stsp .Cm got diff
1038 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
1039 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
1041 4ed9f614 2019-08-04 stsp .Cm got revert
1042 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
1043 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
1045 4ed9f614 2019-08-04 stsp The options for
1046 4ed9f614 2019-08-04 stsp .Cm got stage
1047 4ed9f614 2019-08-04 stsp are as follows:
1048 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
1050 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
1051 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
1052 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
1053 1dd86744 2019-08-12 anthony among the specified paths.
1054 1dd86744 2019-08-12 anthony Otherwise, show all staged paths.
1056 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
1057 dc424a06 2019-08-07 stsp select or reject changes for staging based on
1059 6d23ec10 2019-08-08 stsp (stage change),
1061 6d23ec10 2019-08-08 stsp (reject change), and
1063 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
1064 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
1065 dc424a06 2019-08-07 stsp modified file content can be staged.
1066 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
1067 6d23ec10 2019-08-08 stsp their entirety.
1068 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
1071 3a070a2b 2019-08-07 stsp option, read
1076 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
1077 0e2f5884 2019-08-07 stsp .Ar response-script
1078 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
1081 4ed9f614 2019-08-04 stsp .Cm got stage
1082 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
1083 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
1084 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
1085 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
1086 4ed9f614 2019-08-04 stsp .Cm got update
1087 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
1088 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
1091 4ed9f614 2019-08-04 stsp .Cm got update ,
1092 4ed9f614 2019-08-04 stsp .Cm got rebase ,
1094 4ed9f614 2019-08-04 stsp .Cm got histedit
1095 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
1096 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
1097 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
1098 4ed9f614 2019-08-04 stsp .Cm got unstage
1099 4ed9f614 2019-08-04 stsp before it can be updated with
1100 4ed9f614 2019-08-04 stsp .Cm got update ,
1101 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
1103 4ed9f614 2019-08-04 stsp Short alias for
1104 4ed9f614 2019-08-04 stsp .Cm stage .
1105 dfc23429 2019-08-11 stsp .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
1106 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
1107 4ed9f614 2019-08-04 stsp back into non-staged status.
1110 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
1111 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
1113 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1114 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
1115 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
1116 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
1117 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
1118 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
1119 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
1120 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1123 2e1f37b0 2019-08-08 stsp The options for
1124 2e1f37b0 2019-08-08 stsp .Cm got unstage
1125 2e1f37b0 2019-08-08 stsp are as follows:
1126 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
1128 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
1129 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
1131 2e1f37b0 2019-08-08 stsp (unstage change),
1133 2e1f37b0 2019-08-08 stsp (keep change staged), and
1135 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
1136 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
1137 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
1138 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
1139 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
1142 2e1f37b0 2019-08-08 stsp option, read
1147 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
1148 2e1f37b0 2019-08-08 stsp .Ar response-script
1149 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
1152 4ed9f614 2019-08-04 stsp Short alias for
1153 4ed9f614 2019-08-04 stsp .Cm unstage .
1154 896e9b6f 2019-08-26 stsp .It Cm cat Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar arg ...
1155 896e9b6f 2019-08-26 stsp Parse and print contents of objects to standard output in a line-based
1156 896e9b6f 2019-08-26 stsp text format.
1157 896e9b6f 2019-08-26 stsp Content of commit, tree, and tag objects is printed in a way similar
1158 896e9b6f 2019-08-26 stsp to the actual content stored in such objects.
1159 896e9b6f 2019-08-26 stsp Blob object contents are printed as they would appear in files on disk.
1161 896e9b6f 2019-08-26 stsp Attempt to interpret each argument as a reference, a tag name, or
1162 896e9b6f 2019-08-26 stsp an object ID SHA1 hash.
1163 01073a5d 2019-08-22 stsp References will be resolved to an object ID.
1164 01073a5d 2019-08-22 stsp Tag names will resolved to a tag object.
1165 01073a5d 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1166 01073a5d 2019-08-22 stsp automatically, provided the abbreviation is unique.
1168 896e9b6f 2019-08-26 stsp If none of the above interpretations produce a valid result, or if the
1170 896e9b6f 2019-08-26 stsp option is used, attempt to interpret the argument as a path which will
1171 896e9b6f 2019-08-26 stsp be resolved to the ID of an object found at this path in the repository.
1173 01073a5d 2019-08-22 stsp The options for
1174 01073a5d 2019-08-22 stsp .Cm got cat
1175 01073a5d 2019-08-22 stsp are as follows:
1176 01073a5d 2019-08-22 stsp .Bl -tag -width Ds
1177 896e9b6f 2019-08-26 stsp .It Fl c Ar commit
1178 896e9b6f 2019-08-26 stsp Look up paths in the specified
1179 896e9b6f 2019-08-26 stsp .Ar commit .
1180 896e9b6f 2019-08-26 stsp If this option is not used, paths are looked up in the commit resolved
1181 896e9b6f 2019-08-26 stsp via the repository's HEAD reference.
1182 896e9b6f 2019-08-26 stsp The expected argument is a commit ID SHA1 hash or an existing reference
1183 896e9b6f 2019-08-26 stsp or tag name which will be resolved to a commit ID.
1184 896e9b6f 2019-08-26 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1185 896e9b6f 2019-08-26 stsp automatically, provided the abbreviation is unique.
1186 01073a5d 2019-08-22 stsp .It Fl r Ar repository-path
1187 01073a5d 2019-08-22 stsp Use the repository at the specified path.
1188 01073a5d 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1189 01073a5d 2019-08-22 stsp working directory.
1190 01073a5d 2019-08-22 stsp If this directory is a
1192 01073a5d 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1194 896e9b6f 2019-08-26 stsp Interpret all arguments as paths only.
1195 896e9b6f 2019-08-26 stsp This option can be used to resolve ambiguity in cases where paths
1196 896e9b6f 2019-08-26 stsp look like tag names, reference names, or object IDs.
1199 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
1200 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
1201 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
1202 74416c47 2019-05-09 stsp The author's name and email address for
1203 21a44f98 2019-07-15 stsp .Cm got commit
1205 21a44f98 2019-07-15 stsp .Cm got import ,
1206 74416c47 2019-05-09 stsp for example:
1207 0e444aba 2019-08-08 stsp .An Flan Hacker Aq Mt flan_hacker@openbsd.org .
1210 84792843 2019-08-09 stsp may fail to parse commits without an email address in author data,
1212 84792843 2019-08-09 stsp attempts to reject
1213 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
1214 84792843 2019-08-09 stsp environment variables with a missing email address.
1215 1dd86744 2019-08-12 anthony .It Ev VISUAL , EDITOR
1216 23594da9 2019-05-13 stsp The editor spawned by
1217 8e7bd50a 2019-08-22 stsp .Cm got commit ,
1218 8e7bd50a 2019-08-22 stsp .Cm got import ,
1220 8e7bd50a 2019-08-22 stsp .Cm got tag .
1221 b1ebc001 2019-08-13 stsp .It Ev GOT_LOG_DEFAULT_LIMIT
1222 b1ebc001 2019-08-13 stsp The default limit on the number of commits traversed by
1223 b1ebc001 2019-08-13 stsp .Cm got log .
1224 b1ebc001 2019-08-13 stsp If set to zero, the limit is unbounded.
1225 b1ebc001 2019-08-13 stsp This variable will be silently ignored if it is set to a non-numeric value.
1227 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
1228 5c860e29 2018-03-12 stsp .Ex -std got
1229 97925469 2018-03-17 stsp .Sh EXAMPLES
1230 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
1232 fa6e0e48 2019-05-23 stsp This step currently requires
1233 fa6e0e48 2019-05-23 stsp .Xr git 1 :
1235 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
1236 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
1238 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
1240 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
1241 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
1242 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
1244 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
1245 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
1247 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
1249 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
1251 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
1253 e70c17ce 2019-05-22 stsp .Dl $ got status
1254 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
1256 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
1258 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
1260 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
1262 4e759de4 2019-06-26 stsp .Dl $ got branch -l
1264 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
1265 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
1266 d83d9d5c 2019-05-13 stsp which is forked off the
1267 d83d9d5c 2019-05-13 stsp .Dq master
1270 4e759de4 2019-06-26 stsp .Dl $ got branch unified-buffer-cache master
1272 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
1273 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
1274 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
1276 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
1278 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
1279 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
1281 fa6e0e48 2019-05-23 stsp .Dl $ got commit
1283 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
1284 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
1285 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
1287 cc54c501 2019-07-15 stsp .Dl $ got log -p -l 3 -f
1289 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
1291 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
1292 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
1294 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
1295 e70c17ce 2019-05-22 stsp with a pre-defined log message.
1297 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
1299 95fc3404 2019-07-15 stsp Update any work tree checked out from the
1300 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
1301 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
1303 95fc3404 2019-07-15 stsp .Dl $ got update
1305 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
1306 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
1307 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
1309 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1310 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
1311 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
1312 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1314 9221fb1e 2019-06-26 stsp Fetch new upstream commits into the local repository's master branch.
1315 9221fb1e 2019-06-26 stsp This step currently requires
1316 9221fb1e 2019-06-26 stsp .Xr git 1 :
1318 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
1319 fa6e0e48 2019-05-23 stsp .Dl $ git fetch origin master:master
1321 fa6e0e48 2019-05-23 stsp Rebase the
1322 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
1323 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
1324 fa6e0e48 2019-05-23 stsp .Dq master
1327 818c7501 2019-07-11 stsp .Dl $ got update -b master
1328 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
1330 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
1331 1dd86744 2019-08-12 anthony The patch can be mailed out for review and applied to
1332 1dd86744 2019-08-12 anthony .Ox Ns 's
1333 1dd86744 2019-08-12 anthony CVS tree:
1335 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
1337 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
1338 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
1341 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
1342 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
1343 0ebf8283 2019-07-24 stsp .Dl $ got histedit
1345 7b3fde24 2019-07-28 stsp Additional steps are necessary if local changes need to be pushed back
1346 7b3fde24 2019-07-28 stsp to the remote repository, which currently requires
1347 7b3fde24 2019-07-28 stsp .Cm git fetch
1349 7b3fde24 2019-07-28 stsp .Cm git push .
1350 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
1351 ff2cf171 2019-07-28 stsp .Dq git clone --bare ,
1353 ff2cf171 2019-07-28 stsp .Dq refspec
1354 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
1356 ff2cf171 2019-07-28 stsp .Dq refs/remotes
1357 ff2cf171 2019-07-28 stsp namespace of the local repository.
1358 ff2cf171 2019-07-28 stsp This can achieved by setting Git's
1359 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
1360 ff2cf171 2019-07-28 stsp configuration variable to the value
1361 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
1363 ff2cf171 2019-07-28 stsp .Cm git config
1366 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1367 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
1369 ff2cf171 2019-07-28 stsp Alternatively, the following
1371 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
1372 ff2cf171 2019-07-28 stsp .Pa config
1375 ff2cf171 2019-07-28 stsp .Dl [remote "origin"]
1376 ff2cf171 2019-07-28 stsp .Dl url = ...
1377 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
1379 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
1380 ff2cf171 2019-07-28 stsp .Dq refs/heads
1381 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
1382 ff2cf171 2019-07-28 stsp .Cm got checkout
1383 ff2cf171 2019-07-28 stsp and, if needed, created with
1384 ff2cf171 2019-07-28 stsp .Cm got branch .
1386 ff2cf171 2019-07-28 stsp Branches in the
1387 ff2cf171 2019-07-28 stsp .Dq remotes/origin
1388 ff2cf171 2019-07-28 stsp namespace can be updated with incoming changes from the remote
1389 ff2cf171 2019-07-28 stsp repository with
1390 ff2cf171 2019-07-28 stsp .Cm git fetch :
1392 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1393 ff2cf171 2019-07-28 stsp .Dl $ git fetch
1395 ff2cf171 2019-07-28 stsp Before outgoing changes on the local
1396 ff2cf171 2019-07-28 stsp .Dq master
1397 ff2cf171 2019-07-28 stsp branch can be pushed to the remote repository, the local
1398 ff2cf171 2019-07-28 stsp .Dq master
1399 ff2cf171 2019-07-28 stsp branch must be rebased onto the
1400 ff2cf171 2019-07-28 stsp .Dq origin/master
1403 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
1404 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
1406 ff2cf171 2019-07-28 stsp Changes on the local
1407 ff2cf171 2019-07-28 stsp .Dq master
1408 ff2cf171 2019-07-28 stsp branch can then be pushed to the remote
1409 ff2cf171 2019-07-28 stsp repository with
1410 ff2cf171 2019-07-28 stsp .Cm git push :
1412 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1413 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
1414 5c860e29 2018-03-12 stsp .Sh SEE ALSO
1415 2312fc47 2019-07-15 stsp .Xr tog 1 ,
1416 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
1417 285dc8a4 2018-03-13 stsp .Xr got-worktree 5
1418 1a208aaf 2018-04-01 stsp .Sh AUTHORS
1419 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
1420 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
1421 bc3056e3 2019-08-18 stsp .An Joshua Stein Aq Mt jcs@openbsd.org
1422 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
1424 fa6e0e48 2019-05-23 stsp is a work-in-progress and many commands remain to be implemented.
1425 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
1427 ff2cf171 2019-07-28 stsp to perform many tasks, in particular tasks related to repository
1428 ff2cf171 2019-07-28 stsp administration and tasks which require a network connection.
