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 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 aba9c984 2019-09-08 stsp .Dv user.email configuration settings can be
98 aba9c984 2019-09-08 stsp 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
112 3ce1b845 2019-07-15 stsp .Dq master .
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 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
140 0bb8a95e 2018-03-12 stsp Copy files from a repository into a new work tree.
142 5d7c1dab 2018-04-01 stsp .Ar work tree path
143 c844a238 2019-02-06 stsp is not specified, either use the last component of
144 5d7c1dab 2018-04-01 stsp .Ar repository path ,
146 5d7c1dab 2018-04-01 stsp .Ar path prefix
147 c844a238 2019-02-06 stsp was specified use the last component of
148 5d7c1dab 2018-04-01 stsp .Ar path prefix .
150 38e11793 2018-06-13 stsp The options for
151 38e11793 2018-06-13 stsp .Cm got checkout
152 38e11793 2018-06-13 stsp are as follows:
153 38e11793 2018-06-13 stsp .Bl -tag -width Ds
154 08573d5b 2019-05-14 stsp .It Fl b Ar branch
155 3c575567 2019-07-28 stsp Check out files from a commit on the specified
156 08573d5b 2019-05-14 stsp .Ar branch .
157 08573d5b 2019-05-14 stsp If this option is not specified, a branch resolved via the repository's HEAD
158 08573d5b 2019-05-14 stsp reference will be used.
159 8069f636 2019-01-12 stsp .It Fl c Ar commit
160 8069f636 2019-01-12 stsp Check out files from the specified
162 3c575567 2019-07-28 stsp on the selected branch.
163 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
164 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
165 0e1b0230 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
166 0e1b0230 2019-07-07 stsp automatically, provided the abbreviation is unique.
167 08573d5b 2019-05-14 stsp If this option is not specified, the most recent commit on the selected
168 08573d5b 2019-05-14 stsp branch will be used.
169 38e11793 2018-06-13 stsp .It Fl p Ar path-prefix
170 38e11793 2018-06-13 stsp Restrict the work tree to a subset of the repository's tree hierarchy.
171 38e11793 2018-06-13 stsp Only files beneath the specified
172 38e11793 2018-06-13 stsp .Ar path-prefix
173 38e11793 2018-06-13 stsp will be checked out.
176 97b3a7be 2019-07-09 stsp Short alias for
177 97b3a7be 2019-07-09 stsp .Cm checkout .
178 dfc23429 2019-08-11 stsp .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Op Ar path ...
179 024e9686 2019-05-14 stsp Update an existing work tree to a different commit.
180 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
181 7f838b36 2019-02-08 stsp .Bl -column YXZ description
182 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
183 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
184 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
185 7f838b36 2019-02-08 stsp .It D Ta file was deleted
186 7f838b36 2019-02-08 stsp .It A Ta new file was added
187 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
188 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
193 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
194 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
195 f2ea84fa 2019-07-27 stsp specified paths.
196 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
197 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
198 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
201 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
202 c4cdcb68 2019-04-03 stsp multiple base commits.
203 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
204 47ec7be7 2019-05-12 stsp .Cm got update
205 47ec7be7 2019-05-12 stsp across the entire work tree.
206 024e9686 2019-05-14 stsp Specifying a
208 024e9686 2019-05-14 stsp is incompatible with the
212 4ed9f614 2019-08-04 stsp .Cm got update
213 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
214 4ed9f614 2019-08-04 stsp If changes have been staged with
215 4ed9f614 2019-08-04 stsp .Cm got stage ,
216 bc3056e3 2019-08-18 stsp these changes must first be committed with
217 4ed9f614 2019-08-04 stsp .Cm got commit
218 4ed9f614 2019-08-04 stsp or unstaged with
219 4ed9f614 2019-08-04 stsp .Cm got unstage .
221 507dc3bb 2018-12-29 stsp The options for
222 507dc3bb 2018-12-29 stsp .Cm got update
223 507dc3bb 2018-12-29 stsp are as follows:
224 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
225 024e9686 2019-05-14 stsp .It Fl b Ar branch
226 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
228 024e9686 2019-05-14 stsp before updating the work tree.
229 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
230 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
231 507dc3bb 2018-12-29 stsp Update the work tree to the specified
232 507dc3bb 2018-12-29 stsp .Ar commit .
233 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
234 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
235 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
236 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
237 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
238 024e9686 2019-05-14 stsp branch will be used.
241 97b3a7be 2019-07-09 stsp Short alias for
242 97b3a7be 2019-07-09 stsp .Cm update .
243 dfc23429 2019-08-11 stsp .It Cm status Op Ar path ...
244 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
245 6bad629b 2019-02-04 stsp using the following status codes:
246 6bad629b 2019-02-04 stsp .Bl -column YXZ description
247 6bad629b 2019-02-04 stsp .It M Ta modified file
248 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
249 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
250 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
251 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
252 1dd86744 2019-08-12 anthony .It \(a~ Ta versioned file is obstructed by a non-regular file
253 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
255 2a06fe5f 2019-08-24 stsp .It N Ta non-existent
257 2a06fe5f 2019-08-24 stsp specified on the command line
262 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
263 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
265 4ed9f614 2019-08-04 stsp If changes have been staged with
266 4ed9f614 2019-08-04 stsp .Cm got stage ,
267 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
268 4ed9f614 2019-08-04 stsp status codes:
269 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
270 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
271 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
272 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
275 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
276 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
277 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
278 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
281 6841da00 2019-08-08 stsp For compatibility with
282 6841da00 2019-08-08 stsp .Xr cvs 1 ,
283 6841da00 2019-08-08 stsp .Cm got status
285 6841da00 2019-08-08 stsp .Pa .cvsignore
286 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
287 6841da00 2019-08-08 stsp which match
289 6841da00 2019-08-08 stsp ignore patterns contained in
290 6841da00 2019-08-08 stsp .Pa .cvsignore
293 6841da00 2019-08-08 stsp .Xr cvs 1 ,
294 6841da00 2019-08-08 stsp .Cm got status
295 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
297 97b3a7be 2019-07-09 stsp Short alias for
298 97b3a7be 2019-07-09 stsp .Cm status .
299 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
300 38e11793 2018-06-13 stsp Display history of a repository.
303 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
305 38e11793 2018-06-13 stsp The options for
306 38e11793 2018-06-13 stsp .Cm got log
307 38e11793 2018-06-13 stsp are as follows:
308 38e11793 2018-06-13 stsp .Bl -tag -width Ds
309 38e11793 2018-06-13 stsp .It Fl c Ar commit
310 38e11793 2018-06-13 stsp Start traversing history at the specified
311 38e11793 2018-06-13 stsp .Ar commit .
312 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
313 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
314 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
315 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
316 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
317 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
318 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
319 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
321 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
323 cc54c501 2019-07-15 stsp Restrict history traversal to the first parent of each commit.
324 cc54c501 2019-07-15 stsp This shows the linear history of the current branch only.
325 cc54c501 2019-07-15 stsp Merge commits which affected the current branch will be shown but
326 cc54c501 2019-07-15 stsp individual commits which originated on other branches will be omitted.
327 6238ee32 2018-06-13 stsp .It Fl l Ar N
328 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
329 b1ebc001 2019-08-13 stsp If this option is not specified, a default limit value of zero is used,
330 b1ebc001 2019-08-13 stsp which is treated as an unbounded limit.
332 b1ebc001 2019-08-13 stsp .Ev GOT_LOG_DEFAULT_LIMIT
333 b1ebc001 2019-08-13 stsp environment variable may be set to change this default value.
335 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
338 44392932 2019-08-25 stsp is specified, only show the patch of modifications at or within this path.
339 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
340 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
341 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
342 04ca23f4 2018-07-16 stsp working directory.
343 e9cf2e30 2019-02-05 stsp If this directory is a
345 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
347 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
348 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
349 927df6b7 2019-02-10 stsp uncommitted changes in the work tree.
352 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
354 d24820bf 2019-08-11 stsp If two arguments are provided, treat each argument as a reference, a tag
355 d24820bf 2019-08-11 stsp name, or an object ID SHA1 hash, and display differences between the
356 d24820bf 2019-08-11 stsp corresponding objects.
357 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
358 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
359 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
361 c0cc5c62 2018-10-18 stsp The options for
362 c0cc5c62 2018-10-18 stsp .Cm got diff
363 c0cc5c62 2018-10-18 stsp are as follows:
364 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
365 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
366 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
367 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
368 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
369 b72f483a 2019-02-05 stsp Use the repository at the specified path.
370 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
371 b72f483a 2019-02-05 stsp working directory.
372 b72f483a 2019-02-05 stsp If this directory is a
374 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
376 4ed9f614 2019-08-04 stsp Show changes staged with
377 4ed9f614 2019-08-04 stsp .Cm got stage
378 4ed9f614 2019-08-04 stsp instead of showing local changes.
379 4ed9f614 2019-08-04 stsp This option is only valid when
380 4ed9f614 2019-08-04 stsp .Cm got diff
381 4ed9f614 2019-08-04 stsp is invoked in a work tree.
384 bc26cce8 2019-08-04 stsp Short alias for
386 dfc23429 2019-08-11 stsp .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
387 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
389 1ff8e573 2018-08-02 stsp The options for
390 1ff8e573 2018-08-02 stsp .Cm got blame
391 1ff8e573 2018-08-02 stsp are as follows:
392 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
393 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
394 1ff8e573 2018-08-02 stsp Start traversing history at the specified
395 1ff8e573 2018-08-02 stsp .Ar commit .
396 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
397 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
398 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
399 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
400 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
401 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
402 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
403 1ff8e573 2018-08-02 stsp working directory.
404 0c06baac 2019-02-05 stsp If this directory is a
406 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
409 bc26cce8 2019-08-04 stsp Short alias for
410 bc26cce8 2019-08-04 stsp .Cm blame .
411 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
412 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
413 5de5890b 2018-10-18 stsp directory path in the repository.
414 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
415 db0c2996 2019-02-10 stsp annotations:
416 db0c2996 2019-02-10 stsp .Bl -column YXZ description
417 848d6979 2019-08-12 stsp .It @ Ta entry is a symbolic link
418 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
419 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
420 63c5ca5d 2019-08-24 stsp .It $ Ta entry is a Git submodule
425 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
426 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
427 0c849583 2019-02-05 stsp if there is no work tree.
429 5de5890b 2018-10-18 stsp The options for
430 5de5890b 2018-10-18 stsp .Cm got tree
431 5de5890b 2018-10-18 stsp are as follows:
432 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
433 5de5890b 2018-10-18 stsp .It Fl c Ar commit
434 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
435 5de5890b 2018-10-18 stsp .Ar commit .
436 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
437 303e2782 2019-08-09 stsp or tag name which will be resolved to a commit ID.
438 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
439 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
440 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
441 5de5890b 2018-10-18 stsp Use the repository at the specified path.
442 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
443 5de5890b 2018-10-18 stsp working directory.
444 0c849583 2019-02-05 stsp If this directory is a
446 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
448 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
450 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
453 bc26cce8 2019-08-04 stsp Short alias for
455 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
456 d0eebce4 2019-03-11 stsp Manage references in a repository.
458 d0eebce4 2019-03-11 stsp If no options are passed, expect two arguments and attempt to create,
459 d0eebce4 2019-03-11 stsp or update, the reference with the given
461 d0eebce4 2019-03-11 stsp and make it point at the given
462 d83d9d5c 2019-05-13 stsp .Ar target .
463 a54b6686 2019-06-28 stsp The target may be an object ID SHA1 hash or an existing reference which
464 a54b6686 2019-06-28 stsp will be resolved to an object ID.
465 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
466 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
468 d0eebce4 2019-03-11 stsp The options for
469 d0eebce4 2019-03-11 stsp .Cm got ref
470 d0eebce4 2019-03-11 stsp are as follows:
471 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
472 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
473 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
474 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
475 d0eebce4 2019-03-11 stsp working directory.
476 d0eebce4 2019-03-11 stsp If this directory is a
478 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
480 d0eebce4 2019-03-11 stsp List all existing references in the repository.
481 d0eebce4 2019-03-11 stsp .It Fl d Ar name
482 d0eebce4 2019-03-11 stsp Delete the reference with the specified name from the repository.
484 d1c1ae5f 2019-08-12 stsp Create a symbolic reference pointing at the specified
485 d1c1ae5f 2019-08-12 stsp .Ar target ,
486 d1c1ae5f 2019-08-12 stsp which must be an existing reference.
487 d1c1ae5f 2019-08-12 stsp Care should be taken not to create loops between references when
488 d1c1ae5f 2019-08-12 stsp this option is used.
490 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
491 4e759de4 2019-06-26 stsp Manage branches in a repository.
493 4e759de4 2019-06-26 stsp Branches are managed via references which live in the
494 4e759de4 2019-06-26 stsp .Dq refs/heads/
495 4e759de4 2019-06-26 stsp reference namespace.
497 4e759de4 2019-06-26 stsp .Cm got branch
498 4e759de4 2019-06-26 stsp command operates on references in this namespace only.
500 4e759de4 2019-06-26 stsp If no options are passed, expect one or two arguments and attempt to create
501 a4f89d48 2019-08-25 stsp a branch reference with the given
503 4e759de4 2019-06-26 stsp and make it point at the given
504 a4f89d48 2019-08-25 stsp .Ar commit .
505 a4f89d48 2019-08-25 stsp The expected
507 a4f89d48 2019-08-25 stsp argument is a commit ID SHA1 hash or an existing reference
508 a4f89d48 2019-08-25 stsp or tag name which will be resolved to a commit ID.
511 a4f89d48 2019-08-25 stsp is specified, default to the latest commit on the work tree's current
512 a4f89d48 2019-08-25 stsp branch if invoked in a work tree, or to a commit resolved via the
513 a4f89d48 2019-08-25 stsp repository's HEAD reference.
515 4e759de4 2019-06-26 stsp The options for
516 4e759de4 2019-06-26 stsp .Cm got branch
517 4e759de4 2019-06-26 stsp are as follows:
518 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
519 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
520 4e759de4 2019-06-26 stsp Use the repository at the specified path.
521 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
522 4e759de4 2019-06-26 stsp working directory.
523 4e759de4 2019-06-26 stsp If this directory is a
525 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
527 4e759de4 2019-06-26 stsp List all existing branches in the repository.
528 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
529 ba882ee3 2019-07-11 stsp with one the following annotations:
530 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
531 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
532 1dd86744 2019-08-12 anthony .It \(a~ Ta work tree's base commit is out-of-date
534 4e759de4 2019-06-26 stsp .It Fl d Ar name
535 4e759de4 2019-06-26 stsp Delete the branch with the specified name from the repository.
536 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
537 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
538 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
539 ce33d90e 2019-07-14 stsp Git's garbage collector.
542 97b3a7be 2019-07-09 stsp Short alias for
543 97b3a7be 2019-07-09 stsp .Cm branch .
544 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
545 8e7bd50a 2019-08-22 stsp Manage tags in a repository.
547 8e7bd50a 2019-08-22 stsp Tags are managed via references which live in the
548 8e7bd50a 2019-08-22 stsp .Dq refs/tags/
549 8e7bd50a 2019-08-22 stsp reference namespace.
551 8e7bd50a 2019-08-22 stsp .Cm got tag
552 8e7bd50a 2019-08-22 stsp command operates on references in this namespace only.
553 b3cd068e 2019-08-22 stsp References in this namespace point at tag objects which contain a pointer
554 b3cd068e 2019-08-22 stsp to another object, a tag message, as well as author and timestamp information.
556 8e7bd50a 2019-08-22 stsp Expect one or two arguments and attempt to create a tag with the given
558 8e7bd50a 2019-08-22 stsp and make this tag point at the given
559 8e7bd50a 2019-08-22 stsp .Ar commit .
560 8e7bd50a 2019-08-22 stsp If no commit is specified, default to the latest commit on the work tree's
561 8e7bd50a 2019-08-22 stsp current branch if invoked in a work tree, and to a commit resolved via
562 8e7bd50a 2019-08-22 stsp the repository's HEAD reference otherwise.
563 8e7bd50a 2019-08-22 stsp Otherwise, the expected argument is a commit ID SHA1 hash or an existing
564 8e7bd50a 2019-08-22 stsp reference or tag name which will be resolved to a commit ID.
565 8e7bd50a 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
566 8e7bd50a 2019-08-22 stsp automatically, provided the abbreviation is unique.
568 8e7bd50a 2019-08-22 stsp The options for
569 8e7bd50a 2019-08-22 stsp .Cm got tag
570 8e7bd50a 2019-08-22 stsp are as follows:
571 8e7bd50a 2019-08-22 stsp .Bl -tag -width Ds
572 8e7bd50a 2019-08-22 stsp .It Fl m Ar message
573 8e7bd50a 2019-08-22 stsp Use the specified tag message when creating the new tag
574 8e7bd50a 2019-08-22 stsp Without the
577 8e7bd50a 2019-08-22 stsp .Cm got import
578 8e7bd50a 2019-08-22 stsp opens a temporary file in an editor where a tag message can be written.
579 8e7bd50a 2019-08-22 stsp .It Fl r Ar repository-path
580 8e7bd50a 2019-08-22 stsp Use the repository at the specified path.
581 8e7bd50a 2019-08-22 stsp If not specified, assume the repository is located at or above the current
582 8e7bd50a 2019-08-22 stsp working directory.
583 8e7bd50a 2019-08-22 stsp If this directory is a
585 8e7bd50a 2019-08-22 stsp work tree, use the repository path associated with this work tree.
587 8e7bd50a 2019-08-22 stsp List all existing tags in the repository instead of creating a new tag.
588 8e7bd50a 2019-08-22 stsp If this option is used, no other command-line arguments are allowed.
591 8e7bd50a 2019-08-22 stsp By design, the
592 8e7bd50a 2019-08-22 stsp .Cm got tag
593 8e7bd50a 2019-08-22 stsp command will not delete tags or change existing tags.
594 8e7bd50a 2019-08-22 stsp If a tag must be deleted, the
595 8e7bd50a 2019-08-22 stsp .Cm got ref
596 8e7bd50a 2019-08-22 stsp command may be used to delete a tag's reference.
597 8e7bd50a 2019-08-22 stsp This should only be done if the tag has not already been copied to
598 8e7bd50a 2019-08-22 stsp another repository.
599 fbb7e5c7 2019-05-11 stsp .It Cm add Ar file-path ...
600 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
601 d00136be 2019-03-26 stsp repository in the next commit.
602 648e4ef7 2019-07-09 stsp .It Cm remove Ar file-path ...
603 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
604 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
606 2ec1f75b 2019-03-26 stsp The options for
607 86d25a1b 2019-07-11 stsp .Cm got remove
608 2ec1f75b 2019-03-26 stsp are as follows:
609 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
611 17ed4618 2019-06-02 stsp Perform the operation even if a file contains uncommitted modifications.
614 648e4ef7 2019-07-09 stsp Short alias for
615 648e4ef7 2019-07-09 stsp .Cm remove .
616 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 ...
617 bc3056e3 2019-08-18 stsp Revert any uncommitted changes in files at the specified paths.
618 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
619 1dd86744 2019-08-12 anthony work tree's base commit.
620 1dd86744 2019-08-12 anthony There is no way to bring discarded changes back after
621 a129376b 2019-03-28 stsp .Cm got revert !
623 e20a8b6f 2019-06-04 stsp If a file was added with
624 a129376b 2019-03-28 stsp .Cm got add
625 a129376b 2019-03-28 stsp it will become an unversioned file again.
626 e20a8b6f 2019-06-04 stsp If a file was deleted with
627 86d25a1b 2019-07-11 stsp .Cm got remove
628 a129376b 2019-03-28 stsp it will be restored.
630 0f6d7415 2019-08-08 stsp The options for
631 0f6d7415 2019-08-08 stsp .Cm got revert
632 0f6d7415 2019-08-08 stsp are as follows:
633 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
635 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
636 33aa809d 2019-08-08 stsp changes to revert based on
638 33aa809d 2019-08-08 stsp (revert change),
640 33aa809d 2019-08-08 stsp (keep change), and
642 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
643 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
644 33aa809d 2019-08-08 stsp modified file content can be reverted.
645 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
646 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
649 33aa809d 2019-08-08 stsp option, read
654 33aa809d 2019-08-08 stsp responses line-by-line from the specified
655 33aa809d 2019-08-08 stsp .Ar response-script
656 33aa809d 2019-08-08 stsp file instead of prompting interactively.
658 0f6d7415 2019-08-08 stsp Permit recursion into directories.
659 0f6d7415 2019-08-08 stsp If this option is not specified,
660 0f6d7415 2019-08-08 stsp .Cm got revert
661 0f6d7415 2019-08-08 stsp will refuse to run if a specified
663 0f6d7415 2019-08-08 stsp is a directory.
666 97b3a7be 2019-07-09 stsp Short alias for
667 97b3a7be 2019-07-09 stsp .Cm revert .
668 dfc23429 2019-08-11 stsp .It Cm commit Oo Fl m Ar message Oc Op Ar path ...
669 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
670 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
673 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
674 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
676 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
677 1dd86744 2019-08-12 anthony .Cm got stage ,
678 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
679 4ed9f614 2019-08-04 stsp have not been staged.
681 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
682 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
683 15cd91f7 2019-05-12 stsp .It M Ta modified file
684 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
685 15cd91f7 2019-05-12 stsp .It A Ta new file was added
688 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
689 996d5ccd 2019-08-05 stsp recorded base commit.
692 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
693 15cd91f7 2019-05-12 stsp multiple base commits.
694 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
695 47ec7be7 2019-05-12 stsp .Cm got update
696 47ec7be7 2019-05-12 stsp across the entire work tree.
699 15cd91f7 2019-05-12 stsp .Cm got commit
700 15cd91f7 2019-05-12 stsp command requires the
701 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
702 aba9c984 2019-09-08 stsp environment variable to be set,
703 aba9c984 2019-09-08 stsp unless Git's
704 aba9c984 2019-09-08 stsp .Dv user.name
706 aba9c984 2019-09-08 stsp .Dv user.email configuration settings can be
707 aba9c984 2019-09-08 stsp obtained from the repository's
708 aba9c984 2019-09-08 stsp .Pa .git/config
709 c9956ddf 2019-09-08 stsp file or from Git's global
710 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
711 c9956ddf 2019-09-08 stsp configuration file.
713 74416c47 2019-05-09 stsp The options for
714 74416c47 2019-05-09 stsp .Cm got commit
715 74416c47 2019-05-09 stsp are as follows:
716 74416c47 2019-05-09 stsp .Bl -tag -width Ds
717 74ff3f23 2019-07-07 stsp .It Fl m Ar message
718 74416c47 2019-05-09 stsp Use the specified log message when creating the new commit.
719 23594da9 2019-05-13 stsp Without the
722 23594da9 2019-05-13 stsp .Cm got commit
723 23594da9 2019-05-13 stsp opens a temporary file in an editor where a log message can be written.
726 cfce0458 2019-07-28 stsp .Cm got commit
727 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
728 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
729 916f288c 2019-07-30 stsp .Dq refs/heads/
730 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
731 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
732 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
733 cfce0458 2019-07-28 stsp If a path is found to be out of date,
734 cfce0458 2019-07-28 stsp .Cm got update
735 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
736 cfce0458 2019-07-28 stsp in the repository.
738 97b3a7be 2019-07-09 stsp Short alias for
739 97b3a7be 2019-07-09 stsp .Cm commit .
740 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
741 234035bc 2019-06-01 stsp Merge changes from a single
743 234035bc 2019-06-01 stsp into the work tree.
744 234035bc 2019-06-01 stsp The specified
746 234035bc 2019-06-01 stsp must be on a different branch than the work tree's base commit.
747 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
748 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
749 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
751 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
752 234035bc 2019-06-01 stsp .Bl -column YXZ description
753 234035bc 2019-06-01 stsp .It G Ta file was merged
754 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
755 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
756 234035bc 2019-06-01 stsp .It D Ta file was deleted
757 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
758 234035bc 2019-06-01 stsp .It A Ta new file was added
759 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
762 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
763 234035bc 2019-06-01 stsp may be viewed with
764 234035bc 2019-06-01 stsp .Cm got diff ,
765 234035bc 2019-06-01 stsp amended manually or with further
766 234035bc 2019-06-01 stsp .Cm got cherrypick
768 234035bc 2019-06-01 stsp committed with
769 234035bc 2019-06-01 stsp .Cm got commit ,
770 234035bc 2019-06-01 stsp or discarded again with
771 234035bc 2019-06-01 stsp .Cm got revert .
773 234035bc 2019-06-01 stsp .Cm got cherrypick
774 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
775 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
776 234035bc 2019-06-01 stsp to a single base commit with
777 234035bc 2019-06-01 stsp .Cm got update .
778 234035bc 2019-06-01 stsp If the work tree already contains files with merge conflicts, these
779 234035bc 2019-06-01 stsp conflicts must be resolved first.
781 97b3a7be 2019-07-09 stsp Short alias for
782 97b3a7be 2019-07-09 stsp .Cm cherrypick .
783 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
784 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
786 5ef14e63 2019-06-02 stsp into the work tree.
787 5ef14e63 2019-06-02 stsp The specified
789 5ef14e63 2019-06-02 stsp must be on the same branch as the work tree's base commit.
790 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
791 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
792 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
794 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
795 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
796 5ef14e63 2019-06-02 stsp .It G Ta file was merged
797 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
798 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
799 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
800 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
801 5ef14e63 2019-06-02 stsp .It A Ta new file was added
802 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
805 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
806 5ef14e63 2019-06-02 stsp which may be viewed with
807 5ef14e63 2019-06-02 stsp .Cm got diff ,
808 5ef14e63 2019-06-02 stsp amended manually or with further
809 778a73c2 2019-07-12 stsp .Cm got backout
811 5ef14e63 2019-06-02 stsp committed with
812 5ef14e63 2019-06-02 stsp .Cm got commit ,
813 5ef14e63 2019-06-02 stsp or discarded again with
814 5ef14e63 2019-06-02 stsp .Cm got revert .
816 92228c38 2019-06-02 stsp .Cm got backout
817 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
818 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
819 92228c38 2019-06-02 stsp to a single base commit with
820 92228c38 2019-06-02 stsp .Cm got update .
821 92228c38 2019-06-02 stsp If the work tree already contains files with merge conflicts, these
822 92228c38 2019-06-02 stsp conflicts must be resolved first.
824 97b3a7be 2019-07-09 stsp Short alias for
825 97b3a7be 2019-07-09 stsp .Cm backout .
826 dfc23429 2019-08-11 stsp .It Cm rebase Oo Fl a Oc Oo Fl c Oc Op Ar branch
827 818c7501 2019-07-11 stsp Rebase commits on the specified
829 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
832 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
833 bc3056e3 2019-08-18 stsp Rebasing begins with the first descendant commit of the youngest
834 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
836 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
837 f09e2405 2019-07-11 stsp of the specified
839 f09e2405 2019-07-11 stsp has been rebased.
841 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
842 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
843 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
844 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
845 818c7501 2019-07-11 stsp .Ar branch ,
846 818c7501 2019-07-11 stsp but with different commit IDs.
847 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
848 f09e2405 2019-07-11 stsp the new version of the specified
850 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
852 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
853 818c7501 2019-07-11 stsp using the following status codes:
854 818c7501 2019-07-11 stsp .Bl -column YXZ description
855 818c7501 2019-07-11 stsp .It G Ta file was merged
856 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
857 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
858 818c7501 2019-07-11 stsp .It D Ta file was deleted
859 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
860 818c7501 2019-07-11 stsp .It A Ta new file was added
861 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
864 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
865 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
866 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
868 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
870 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
871 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
872 f09e2405 2019-07-11 stsp when the rebase operation continues.
874 818c7501 2019-07-11 stsp .Cm got rebase
875 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
876 818c7501 2019-07-11 stsp If the work tree contains multiple base commits it must first be updated
877 818c7501 2019-07-11 stsp to a single base commit with
878 818c7501 2019-07-11 stsp .Cm got update .
879 4ed9f614 2019-08-04 stsp If changes have been staged with
880 4ed9f614 2019-08-04 stsp .Cm got stage ,
881 bc3056e3 2019-08-18 stsp these changes must first be committed with
882 4ed9f614 2019-08-04 stsp .Cm got commit
883 4ed9f614 2019-08-04 stsp or unstaged with
884 4ed9f614 2019-08-04 stsp .Cm got unstage .
885 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
886 f09e2405 2019-07-11 stsp committed with
887 f09e2405 2019-07-11 stsp .Cm got commit
888 f09e2405 2019-07-11 stsp or reverted with
889 f09e2405 2019-07-11 stsp .Cm got revert .
892 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
893 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
896 7d5807f4 2019-07-11 stsp .Cm got update
898 7d5807f4 2019-07-11 stsp .Cm got commit
899 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
900 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
901 7d5807f4 2019-07-11 stsp conflict resolution purposes.
903 818c7501 2019-07-11 stsp The options for
904 818c7501 2019-07-11 stsp .Cm got rebase
905 818c7501 2019-07-11 stsp are as follows:
906 818c7501 2019-07-11 stsp .Bl -tag -width Ds
908 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
909 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
911 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
912 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
915 818c7501 2019-07-11 stsp Short alias for
916 818c7501 2019-07-11 stsp .Cm rebase .
917 dfc23429 2019-08-11 stsp .It Cm histedit Oo Fl a Oc Oo Fl c Oc Op Fl F Ar histedit-script
918 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
919 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
921 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
922 0ebf8283 2019-07-24 stsp .Ar histedit script
923 0ebf8283 2019-07-24 stsp which can be edited interactively or passed on the command line.
924 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
925 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
926 0ebf8283 2019-07-24 stsp whitespace and an argument.
927 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
928 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
929 0ebf8283 2019-07-24 stsp Lines which begin with the
931 0ebf8283 2019-07-24 stsp character are ignored entirely.
933 0ebf8283 2019-07-24 stsp The available commands are as follows:
934 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
935 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
936 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
937 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
938 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
939 0ebf8283 2019-07-24 stsp listed further below that will be used.
940 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
941 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
942 0ebf8283 2019-07-24 stsp the commit on the previous line.
943 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
944 0ebf8283 2019-07-24 stsp log message can be written.
947 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
948 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
950 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
951 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
952 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
953 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
954 498a90b7 2019-07-25 stsp switched to it.
956 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
957 0ebf8283 2019-07-24 stsp using the following status codes:
958 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
959 0ebf8283 2019-07-24 stsp .It G Ta file was merged
960 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
961 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
962 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
963 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
964 0ebf8283 2019-07-24 stsp .It A Ta new file was added
965 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
968 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
969 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
970 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
971 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
973 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
974 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
975 0ebf8283 2019-07-24 stsp when the histedit operation continues.
977 0ebf8283 2019-07-24 stsp .Cm got histedit
978 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
979 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
980 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
981 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
982 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
983 0ebf8283 2019-07-24 stsp to a single base commit with
984 0ebf8283 2019-07-24 stsp .Cm got update .
985 4ed9f614 2019-08-04 stsp If changes have been staged with
986 4ed9f614 2019-08-04 stsp .Cm got stage ,
987 bc3056e3 2019-08-18 stsp these changes must first be committed with
988 4ed9f614 2019-08-04 stsp .Cm got commit
989 4ed9f614 2019-08-04 stsp or unstaged with
990 4ed9f614 2019-08-04 stsp .Cm got unstage .
991 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
992 0ebf8283 2019-07-24 stsp committed with
993 0ebf8283 2019-07-24 stsp .Cm got commit
994 0ebf8283 2019-07-24 stsp or reverted with
995 0ebf8283 2019-07-24 stsp .Cm got revert .
996 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
997 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
1000 0ebf8283 2019-07-24 stsp .Cm got update
1001 a698f62e 2019-07-25 stsp command will refuse to run while a histedit operation is in progress.
1002 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
1003 0ebf8283 2019-07-24 stsp .Cm got commit
1004 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
1005 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
1007 0ebf8283 2019-07-24 stsp The options for
1008 0ebf8283 2019-07-24 stsp .Cm got histedit
1009 0ebf8283 2019-07-24 stsp are as follows:
1010 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
1012 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
1013 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1015 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
1016 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
1019 0ebf8283 2019-07-24 stsp Short alias for
1020 0ebf8283 2019-07-24 stsp .Cm histedit .
1021 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 ...
1022 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
1025 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
1026 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
1027 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
1028 4ed9f614 2019-08-04 stsp .Cm got status .
1030 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1031 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
1032 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
1033 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
1034 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
1037 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
1038 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
1039 9d8b19a4 2019-08-04 stsp committed.
1041 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
1042 4ed9f614 2019-08-04 stsp .Cm got commit ,
1043 4ed9f614 2019-08-04 stsp .Cm got status ,
1045 4ed9f614 2019-08-04 stsp .Cm got diff .
1046 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
1047 4ed9f614 2019-08-04 stsp .Cm got commit
1048 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
1049 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
1050 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
1052 4ed9f614 2019-08-04 stsp .Cm got status
1053 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
1055 4ed9f614 2019-08-04 stsp .Cm got diff
1056 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
1057 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
1059 4ed9f614 2019-08-04 stsp .Cm got revert
1060 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
1061 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
1063 4ed9f614 2019-08-04 stsp The options for
1064 4ed9f614 2019-08-04 stsp .Cm got stage
1065 4ed9f614 2019-08-04 stsp are as follows:
1066 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
1068 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
1069 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
1070 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
1071 1dd86744 2019-08-12 anthony among the specified paths.
1072 1dd86744 2019-08-12 anthony Otherwise, show all staged paths.
1074 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
1075 dc424a06 2019-08-07 stsp select or reject changes for staging based on
1077 6d23ec10 2019-08-08 stsp (stage change),
1079 6d23ec10 2019-08-08 stsp (reject change), and
1081 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
1082 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
1083 dc424a06 2019-08-07 stsp modified file content can be staged.
1084 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
1085 6d23ec10 2019-08-08 stsp their entirety.
1086 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
1089 3a070a2b 2019-08-07 stsp option, read
1094 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
1095 0e2f5884 2019-08-07 stsp .Ar response-script
1096 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
1099 4ed9f614 2019-08-04 stsp .Cm got stage
1100 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
1101 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
1102 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
1103 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
1104 4ed9f614 2019-08-04 stsp .Cm got update
1105 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
1106 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
1109 4ed9f614 2019-08-04 stsp .Cm got update ,
1110 4ed9f614 2019-08-04 stsp .Cm got rebase ,
1112 4ed9f614 2019-08-04 stsp .Cm got histedit
1113 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
1114 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
1115 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
1116 4ed9f614 2019-08-04 stsp .Cm got unstage
1117 4ed9f614 2019-08-04 stsp before it can be updated with
1118 4ed9f614 2019-08-04 stsp .Cm got update ,
1119 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
1121 4ed9f614 2019-08-04 stsp Short alias for
1122 4ed9f614 2019-08-04 stsp .Cm stage .
1123 dfc23429 2019-08-11 stsp .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
1124 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
1125 4ed9f614 2019-08-04 stsp back into non-staged status.
1128 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
1129 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
1131 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1132 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
1133 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
1134 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
1135 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
1136 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
1137 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
1138 1dd86744 2019-08-12 anthony .It \(a~ Ta changes destined for a non-regular file were not merged
1141 2e1f37b0 2019-08-08 stsp The options for
1142 2e1f37b0 2019-08-08 stsp .Cm got unstage
1143 2e1f37b0 2019-08-08 stsp are as follows:
1144 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
1146 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
1147 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
1149 2e1f37b0 2019-08-08 stsp (unstage change),
1151 2e1f37b0 2019-08-08 stsp (keep change staged), and
1153 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
1154 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
1155 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
1156 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
1157 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
1160 2e1f37b0 2019-08-08 stsp option, read
1165 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
1166 2e1f37b0 2019-08-08 stsp .Ar response-script
1167 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
1170 4ed9f614 2019-08-04 stsp Short alias for
1171 4ed9f614 2019-08-04 stsp .Cm unstage .
1172 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 ...
1173 896e9b6f 2019-08-26 stsp Parse and print contents of objects to standard output in a line-based
1174 896e9b6f 2019-08-26 stsp text format.
1175 896e9b6f 2019-08-26 stsp Content of commit, tree, and tag objects is printed in a way similar
1176 896e9b6f 2019-08-26 stsp to the actual content stored in such objects.
1177 896e9b6f 2019-08-26 stsp Blob object contents are printed as they would appear in files on disk.
1179 896e9b6f 2019-08-26 stsp Attempt to interpret each argument as a reference, a tag name, or
1180 896e9b6f 2019-08-26 stsp an object ID SHA1 hash.
1181 01073a5d 2019-08-22 stsp References will be resolved to an object ID.
1182 01073a5d 2019-08-22 stsp Tag names will resolved to a tag object.
1183 01073a5d 2019-08-22 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1184 01073a5d 2019-08-22 stsp automatically, provided the abbreviation is unique.
1186 896e9b6f 2019-08-26 stsp If none of the above interpretations produce a valid result, or if the
1188 896e9b6f 2019-08-26 stsp option is used, attempt to interpret the argument as a path which will
1189 896e9b6f 2019-08-26 stsp be resolved to the ID of an object found at this path in the repository.
1191 01073a5d 2019-08-22 stsp The options for
1192 01073a5d 2019-08-22 stsp .Cm got cat
1193 01073a5d 2019-08-22 stsp are as follows:
1194 01073a5d 2019-08-22 stsp .Bl -tag -width Ds
1195 896e9b6f 2019-08-26 stsp .It Fl c Ar commit
1196 896e9b6f 2019-08-26 stsp Look up paths in the specified
1197 896e9b6f 2019-08-26 stsp .Ar commit .
1198 896e9b6f 2019-08-26 stsp If this option is not used, paths are looked up in the commit resolved
1199 896e9b6f 2019-08-26 stsp via the repository's HEAD reference.
1200 896e9b6f 2019-08-26 stsp The expected argument is a commit ID SHA1 hash or an existing reference
1201 896e9b6f 2019-08-26 stsp or tag name which will be resolved to a commit ID.
1202 896e9b6f 2019-08-26 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
1203 896e9b6f 2019-08-26 stsp automatically, provided the abbreviation is unique.
1204 01073a5d 2019-08-22 stsp .It Fl r Ar repository-path
1205 01073a5d 2019-08-22 stsp Use the repository at the specified path.
1206 01073a5d 2019-08-22 stsp If not specified, assume the repository is located at or above the current
1207 01073a5d 2019-08-22 stsp working directory.
1208 01073a5d 2019-08-22 stsp If this directory is a
1210 01073a5d 2019-08-22 stsp work tree, use the repository path associated with this work tree.
1212 896e9b6f 2019-08-26 stsp Interpret all arguments as paths only.
1213 896e9b6f 2019-08-26 stsp This option can be used to resolve ambiguity in cases where paths
1214 896e9b6f 2019-08-26 stsp look like tag names, reference names, or object IDs.
1217 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
1218 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
1219 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
1220 74416c47 2019-05-09 stsp The author's name and email address for
1221 21a44f98 2019-07-15 stsp .Cm got commit
1223 21a44f98 2019-07-15 stsp .Cm got import ,
1224 74416c47 2019-05-09 stsp for example:
1225 aba9c984 2019-09-08 stsp .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
1228 84792843 2019-08-09 stsp may fail to parse commits without an email address in author data,
1230 84792843 2019-08-09 stsp attempts to reject
1231 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
1232 84792843 2019-08-09 stsp environment variables with a missing email address.
1234 c9956ddf 2019-09-08 stsp If present, Git's
1235 aba9c984 2019-09-08 stsp .Dv user.name
1237 aba9c984 2019-09-08 stsp .Dv user.email configuration settings in the repository's
1238 aba9c984 2019-09-08 stsp .Pa .git/config
1239 aba9c984 2019-09-08 stsp file will override the value of
1240 aba9c984 2019-09-08 stsp .Ev GOT_AUTHOR .
1241 c9956ddf 2019-09-08 stsp However, the
1242 c9956ddf 2019-09-08 stsp .Dv user.name
1244 c9956ddf 2019-09-08 stsp .Dv user.email
1245 c9956ddf 2019-09-08 stsp configuration settings contained in Git's global
1246 c9956ddf 2019-09-08 stsp .Pa ~/.gitconfig
1247 c9956ddf 2019-09-08 stsp configuration file will be used only if the
1248 c9956ddf 2019-09-08 stsp .Ev GOT_AUTHOR
1249 c9956ddf 2019-09-08 stsp environment variable is
1252 1dd86744 2019-08-12 anthony .It Ev VISUAL , EDITOR
1253 23594da9 2019-05-13 stsp The editor spawned by
1254 8e7bd50a 2019-08-22 stsp .Cm got commit ,
1255 8e7bd50a 2019-08-22 stsp .Cm got import ,
1257 8e7bd50a 2019-08-22 stsp .Cm got tag .
1258 b1ebc001 2019-08-13 stsp .It Ev GOT_LOG_DEFAULT_LIMIT
1259 b1ebc001 2019-08-13 stsp The default limit on the number of commits traversed by
1260 b1ebc001 2019-08-13 stsp .Cm got log .
1261 b1ebc001 2019-08-13 stsp If set to zero, the limit is unbounded.
1262 b1ebc001 2019-08-13 stsp This variable will be silently ignored if it is set to a non-numeric value.
1264 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
1265 5c860e29 2018-03-12 stsp .Ex -std got
1266 97925469 2018-03-17 stsp .Sh EXAMPLES
1267 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
1269 fa6e0e48 2019-05-23 stsp This step currently requires
1270 fa6e0e48 2019-05-23 stsp .Xr git 1 :
1272 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
1273 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
1275 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
1277 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
1278 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
1279 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
1281 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
1282 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
1284 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
1286 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
1288 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
1290 e70c17ce 2019-05-22 stsp .Dl $ got status
1291 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
1293 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
1295 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
1297 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
1299 4e759de4 2019-06-26 stsp .Dl $ got branch -l
1301 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
1302 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
1303 d83d9d5c 2019-05-13 stsp which is forked off the
1304 d83d9d5c 2019-05-13 stsp .Dq master
1307 4e759de4 2019-06-26 stsp .Dl $ got branch unified-buffer-cache master
1309 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
1310 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
1311 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
1313 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
1315 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
1316 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
1318 fa6e0e48 2019-05-23 stsp .Dl $ got commit
1320 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
1321 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
1322 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
1324 cc54c501 2019-07-15 stsp .Dl $ got log -p -l 3 -f
1326 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
1328 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
1329 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
1331 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
1332 e70c17ce 2019-05-22 stsp with a pre-defined log message.
1334 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
1336 95fc3404 2019-07-15 stsp Update any work tree checked out from the
1337 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
1338 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
1340 95fc3404 2019-07-15 stsp .Dl $ got update
1342 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
1343 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
1344 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
1346 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1347 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
1348 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
1349 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1351 9221fb1e 2019-06-26 stsp Fetch new upstream commits into the local repository's master branch.
1352 9221fb1e 2019-06-26 stsp This step currently requires
1353 9221fb1e 2019-06-26 stsp .Xr git 1 :
1355 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
1356 fa6e0e48 2019-05-23 stsp .Dl $ git fetch origin master:master
1358 fa6e0e48 2019-05-23 stsp Rebase the
1359 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
1360 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
1361 fa6e0e48 2019-05-23 stsp .Dq master
1364 818c7501 2019-07-11 stsp .Dl $ got update -b master
1365 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
1367 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
1368 1dd86744 2019-08-12 anthony The patch can be mailed out for review and applied to
1369 1dd86744 2019-08-12 anthony .Ox Ns 's
1370 1dd86744 2019-08-12 anthony CVS tree:
1372 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
1374 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
1375 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
1378 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
1379 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
1380 0ebf8283 2019-07-24 stsp .Dl $ got histedit
1382 7b3fde24 2019-07-28 stsp Additional steps are necessary if local changes need to be pushed back
1383 7b3fde24 2019-07-28 stsp to the remote repository, which currently requires
1384 7b3fde24 2019-07-28 stsp .Cm git fetch
1386 7b3fde24 2019-07-28 stsp .Cm git push .
1387 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
1388 ff2cf171 2019-07-28 stsp .Dq git clone --bare ,
1390 ff2cf171 2019-07-28 stsp .Dq refspec
1391 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
1393 ff2cf171 2019-07-28 stsp .Dq refs/remotes
1394 ff2cf171 2019-07-28 stsp namespace of the local repository.
1395 ff2cf171 2019-07-28 stsp This can achieved by setting Git's
1396 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
1397 ff2cf171 2019-07-28 stsp configuration variable to the value
1398 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
1400 ff2cf171 2019-07-28 stsp .Cm git config
1403 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1404 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
1406 ff2cf171 2019-07-28 stsp Alternatively, the following
1408 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
1409 ff2cf171 2019-07-28 stsp .Pa config
1412 ff2cf171 2019-07-28 stsp .Dl [remote "origin"]
1413 ff2cf171 2019-07-28 stsp .Dl url = ...
1414 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
1416 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
1417 ff2cf171 2019-07-28 stsp .Dq refs/heads
1418 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
1419 ff2cf171 2019-07-28 stsp .Cm got checkout
1420 ff2cf171 2019-07-28 stsp and, if needed, created with
1421 ff2cf171 2019-07-28 stsp .Cm got branch .
1423 ff2cf171 2019-07-28 stsp Branches in the
1424 ff2cf171 2019-07-28 stsp .Dq remotes/origin
1425 ff2cf171 2019-07-28 stsp namespace can be updated with incoming changes from the remote
1426 ff2cf171 2019-07-28 stsp repository with
1427 ff2cf171 2019-07-28 stsp .Cm git fetch :
1429 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1430 ff2cf171 2019-07-28 stsp .Dl $ git fetch
1432 ff2cf171 2019-07-28 stsp Before outgoing changes on the local
1433 ff2cf171 2019-07-28 stsp .Dq master
1434 ff2cf171 2019-07-28 stsp branch can be pushed to the remote repository, the local
1435 ff2cf171 2019-07-28 stsp .Dq master
1436 ff2cf171 2019-07-28 stsp branch must be rebased onto the
1437 ff2cf171 2019-07-28 stsp .Dq origin/master
1440 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
1441 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
1443 ff2cf171 2019-07-28 stsp Changes on the local
1444 ff2cf171 2019-07-28 stsp .Dq master
1445 ff2cf171 2019-07-28 stsp branch can then be pushed to the remote
1446 ff2cf171 2019-07-28 stsp repository with
1447 ff2cf171 2019-07-28 stsp .Cm git push :
1449 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1450 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
1451 5c860e29 2018-03-12 stsp .Sh SEE ALSO
1452 2312fc47 2019-07-15 stsp .Xr tog 1 ,
1453 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
1454 285dc8a4 2018-03-13 stsp .Xr got-worktree 5
1455 1a208aaf 2018-04-01 stsp .Sh AUTHORS
1456 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
1457 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
1458 bc3056e3 2019-08-18 stsp .An Joshua Stein Aq Mt jcs@openbsd.org
1459 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
1461 fa6e0e48 2019-05-23 stsp is a work-in-progress and many commands remain to be implemented.
1462 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
1464 ff2cf171 2019-07-28 stsp to perform many tasks, in particular tasks related to repository
1465 ff2cf171 2019-07-28 stsp administration and tasks which require a network connection.
