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 285dc8a4 2018-03-13 stsp Global options must preceed 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.
78 bc26cce8 2019-08-04 stsp Short alias for
80 3ce1b845 2019-07-15 stsp .It Cm import [ Fl b Ar branch ] [ Fl m Ar message ] [ Fl r Ar repository-path ] [ Fl I Ar pattern ] directory
81 3ce1b845 2019-07-15 stsp Create an initial commit in a repository from the file hierarchy
82 3ce1b845 2019-07-15 stsp within the specified
83 3ce1b845 2019-07-15 stsp .Ar directory .
84 3ce1b845 2019-07-15 stsp The created commit will not have any parent commits, i.e. it will be a
85 3ce1b845 2019-07-15 stsp root commit.
86 3ce1b845 2019-07-15 stsp Also create a new reference which provides a branch name for the newly
87 3ce1b845 2019-07-15 stsp created commit.
88 21a44f98 2019-07-15 stsp Show the path of each imported file to indicate progress.
91 21a44f98 2019-07-15 stsp .Cm got import
92 21a44f98 2019-07-15 stsp command requires the
93 21a44f98 2019-07-15 stsp .Ev GOT_AUTHOR
94 21a44f98 2019-07-15 stsp environment variable to be set.
96 3ce1b845 2019-07-15 stsp The options for
97 3ce1b845 2019-07-15 stsp .Cm got import
98 3ce1b845 2019-07-15 stsp are as follows:
99 3ce1b845 2019-07-15 stsp .Bl -tag -width Ds
100 3ce1b845 2019-07-15 stsp .It Fl b Ar branch
101 3ce1b845 2019-07-15 stsp Create the specified
103 3ce1b845 2019-07-15 stsp instead of creating the default branch
104 3ce1b845 2019-07-15 stsp .Dq master .
105 3ce1b845 2019-07-15 stsp Use of this option is required if the
107 3ce1b845 2019-07-15 stsp branch already exists.
108 3ce1b845 2019-07-15 stsp .It Fl m Ar message
109 3ce1b845 2019-07-15 stsp Use the specified log message when creating the new commit.
110 3ce1b845 2019-07-15 stsp Without the
113 3ce1b845 2019-07-15 stsp .Cm got import
114 3ce1b845 2019-07-15 stsp opens a temporary file in an editor where a log message can be written.
115 3ce1b845 2019-07-15 stsp .It Fl r Ar repository-path
116 3ce1b845 2019-07-15 stsp Use the repository at the specified path.
117 3ce1b845 2019-07-15 stsp If not specified, assume the repository is located at or above the current
118 3ce1b845 2019-07-15 stsp working directory.
119 3ce1b845 2019-07-15 stsp .It Fl I Ar pattern
120 3ce1b845 2019-07-15 stsp Ignore files or directories with a name which matches the specified
121 3ce1b845 2019-07-15 stsp .Ar pattern .
122 3ce1b845 2019-07-15 stsp This option may be specified multiple times to build a list of ignore patterns.
124 3ce1b845 2019-07-15 stsp .Ar pattern
125 3ce1b845 2019-07-15 stsp follows the globbing rules documented in
126 3ce1b845 2019-07-15 stsp .Xr glob 7 .
129 bc26cce8 2019-08-04 stsp Short alias for
130 bc26cce8 2019-08-04 stsp .Cm import .
131 08573d5b 2019-05-14 stsp .It Cm checkout [ Fl b Ar branch ] [ Fl c Ar commit ] [ Fl p Ar path-prefix ] repository-path [ work-tree-path ]
132 0bb8a95e 2018-03-12 stsp Copy files from a repository into a new work tree.
134 5d7c1dab 2018-04-01 stsp .Ar work tree path
135 c844a238 2019-02-06 stsp is not specified, either use the last component of
136 5d7c1dab 2018-04-01 stsp .Ar repository path ,
138 5d7c1dab 2018-04-01 stsp .Ar path prefix
139 c844a238 2019-02-06 stsp was specified use the last component of
140 5d7c1dab 2018-04-01 stsp .Ar path prefix .
142 38e11793 2018-06-13 stsp The options for
143 38e11793 2018-06-13 stsp .Cm got checkout
144 38e11793 2018-06-13 stsp are as follows:
145 38e11793 2018-06-13 stsp .Bl -tag -width Ds
146 08573d5b 2019-05-14 stsp .It Fl b Ar branch
147 3c575567 2019-07-28 stsp Check out files from a commit on the specified
148 08573d5b 2019-05-14 stsp .Ar branch .
149 08573d5b 2019-05-14 stsp If this option is not specified, a branch resolved via the repository's HEAD
150 08573d5b 2019-05-14 stsp reference will be used.
151 8069f636 2019-01-12 stsp .It Fl c Ar commit
152 8069f636 2019-01-12 stsp Check out files from the specified
154 3c575567 2019-07-28 stsp on the selected branch.
155 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
156 30837e32 2019-07-25 stsp which will be resolved to a commit ID.
157 0e1b0230 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
158 0e1b0230 2019-07-07 stsp automatically, provided the abbreviation is unique.
159 08573d5b 2019-05-14 stsp If this option is not specified, the most recent commit on the selected
160 08573d5b 2019-05-14 stsp branch will be used.
161 38e11793 2018-06-13 stsp .It Fl p Ar path-prefix
162 38e11793 2018-06-13 stsp Restrict the work tree to a subset of the repository's tree hierarchy.
163 38e11793 2018-06-13 stsp Only files beneath the specified
164 38e11793 2018-06-13 stsp .Ar path-prefix
165 38e11793 2018-06-13 stsp will be checked out.
168 97b3a7be 2019-07-09 stsp Short alias for
169 97b3a7be 2019-07-09 stsp .Cm checkout .
170 f2ea84fa 2019-07-27 stsp .It Cm update [ Fl b Ar branch ] [ Fl c Ar commit ] [ Ar path ... ]
171 024e9686 2019-05-14 stsp Update an existing work tree to a different commit.
172 7f838b36 2019-02-08 stsp Show the status of each affected file, using the following status codes:
173 7f838b36 2019-02-08 stsp .Bl -column YXZ description
174 7f838b36 2019-02-08 stsp .It U Ta file was updated and contained no local changes
175 7f838b36 2019-02-08 stsp .It G Ta file was updated and local changes were merged cleanly
176 7f838b36 2019-02-08 stsp .It C Ta file was updated and conflicts occurred during merge
177 7f838b36 2019-02-08 stsp .It D Ta file was deleted
178 7f838b36 2019-02-08 stsp .It A Ta new file was added
179 7f838b36 2019-02-08 stsp .It ~ Ta versioned file is obstructed by a non-regular file
180 a378724f 2019-02-10 stsp .It ! Ta a missing versioned file was restored
185 f2ea84fa 2019-07-27 stsp is specified, update the entire work tree.
186 f2ea84fa 2019-07-27 stsp Otherwise, restrict the update operation to files at or within the
187 f2ea84fa 2019-07-27 stsp specified paths.
188 f2ea84fa 2019-07-27 stsp Each path is required to exist in the update operation's target commit.
189 f2ea84fa 2019-07-27 stsp Files in the work tree outside specified paths will remain unchanged and
190 f2ea84fa 2019-07-27 stsp will retain their previously recorded base commit.
193 f2cf8fbb 2019-04-04 stsp commands may refuse to run while the work tree contains files from
194 c4cdcb68 2019-04-03 stsp multiple base commits.
195 f2cf8fbb 2019-04-04 stsp The base commit of such a work tree can be made consistent by running
196 47ec7be7 2019-05-12 stsp .Cm got update
197 47ec7be7 2019-05-12 stsp across the entire work tree.
198 024e9686 2019-05-14 stsp Specifying a
200 024e9686 2019-05-14 stsp is incompatible with the
204 4ed9f614 2019-08-04 stsp .Cm got update
205 4ed9f614 2019-08-04 stsp cannot update paths with staged changes.
206 4ed9f614 2019-08-04 stsp If changes have been staged with
207 4ed9f614 2019-08-04 stsp .Cm got stage ,
208 4ed9f614 2019-08-04 stsp these changes must first be comitted with
209 4ed9f614 2019-08-04 stsp .Cm got commit
210 4ed9f614 2019-08-04 stsp or unstaged with
211 4ed9f614 2019-08-04 stsp .Cm got unstage .
213 507dc3bb 2018-12-29 stsp The options for
214 507dc3bb 2018-12-29 stsp .Cm got update
215 507dc3bb 2018-12-29 stsp are as follows:
216 507dc3bb 2018-12-29 stsp .Bl -tag -width Ds
217 024e9686 2019-05-14 stsp .It Fl b Ar branch
218 024e9686 2019-05-14 stsp Switch the work tree's branch reference to the specified
220 024e9686 2019-05-14 stsp before updating the work tree.
221 024e9686 2019-05-14 stsp This option requires that all paths in the work tree are updated.
222 507dc3bb 2018-12-29 stsp .It Fl c Ar commit
223 507dc3bb 2018-12-29 stsp Update the work tree to the specified
224 507dc3bb 2018-12-29 stsp .Ar commit .
225 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
226 30837e32 2019-07-25 stsp which will be resolved to a commit ID.
227 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
228 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
229 024e9686 2019-05-14 stsp If this option is not specified, the most recent commit on the work tree's
230 024e9686 2019-05-14 stsp branch will be used.
233 97b3a7be 2019-07-09 stsp Short alias for
234 97b3a7be 2019-07-09 stsp .Cm update .
235 72ea6654 2019-07-27 stsp .It Cm status [ Ar path ... ]
236 6cd959e6 2019-03-26 stsp Show the current modification status of files in a work tree,
237 6bad629b 2019-02-04 stsp using the following status codes:
238 6bad629b 2019-02-04 stsp .Bl -column YXZ description
239 6bad629b 2019-02-04 stsp .It M Ta modified file
240 079890a9 2019-03-26 stsp .It A Ta file scheduled for addition in next commit
241 079890a9 2019-03-26 stsp .It D Ta file scheduled for deletion in next commit
242 7154f6ce 2019-03-27 stsp .It C Ta modified or added file which contains merge conflicts
243 6bad629b 2019-02-04 stsp .It ! Ta versioned file was expected on disk but is missing
244 0dbc2271 2019-02-05 stsp .It ~ Ta versioned file is obstructed by a non-regular file
245 6bad629b 2019-02-04 stsp .It ? Ta unversioned item not tracked by
251 72ea6654 2019-07-27 stsp is specified, show modifications in the entire work tree.
252 72ea6654 2019-07-27 stsp Otherwise, show modifications at or within the specified paths.
254 4ed9f614 2019-08-04 stsp If changes have been staged with
255 4ed9f614 2019-08-04 stsp .Cm got stage ,
256 4ed9f614 2019-08-04 stsp staged changes are shown in the second output column, using the following
257 4ed9f614 2019-08-04 stsp status codes:
258 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
259 4ed9f614 2019-08-04 stsp .It M Ta file modification is staged
260 4ed9f614 2019-08-04 stsp .It A Ta file addition is staged
261 4ed9f614 2019-08-04 stsp .It D Ta file deletion is staged
264 95ac67f0 2019-08-08 stsp Changes created on top of staged changes are indicated in the first column:
265 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
266 95ac67f0 2019-08-08 stsp .It MM Ta file was modified after earlier changes have been staged
267 95ac67f0 2019-08-08 stsp .It MA Ta file was modified after having been staged for addition
270 6841da00 2019-08-08 stsp For compatibility with
271 6841da00 2019-08-08 stsp .Xr cvs 1 ,
272 6841da00 2019-08-08 stsp .Cm got status
274 6841da00 2019-08-08 stsp .Pa .cvsignore
275 6841da00 2019-08-08 stsp files in each traversed directory and will not display unversioned files
276 6841da00 2019-08-08 stsp which match
278 6841da00 2019-08-08 stsp ignore patterns contained in
279 6841da00 2019-08-08 stsp .Pa .cvsignore
282 6841da00 2019-08-08 stsp .Xr cvs 1 ,
283 6841da00 2019-08-08 stsp .Cm got status
284 6841da00 2019-08-08 stsp only supports a single ignore pattern per line.
286 97b3a7be 2019-07-09 stsp Short alias for
287 97b3a7be 2019-07-09 stsp .Cm status .
288 f400486b 2019-07-15 stsp .It Cm log [ Fl c Ar commit ] [ Fl C Ar number ] [ Fl f ] [ Fl l Ar N ] [ Fl p ] [ Fl r Ar repository-path ] [ path ]
289 38e11793 2018-06-13 stsp Display history of a repository.
292 04ca23f4 2018-07-16 stsp is specified, show only commits which modified this path.
294 38e11793 2018-06-13 stsp The options for
295 38e11793 2018-06-13 stsp .Cm got log
296 38e11793 2018-06-13 stsp are as follows:
297 38e11793 2018-06-13 stsp .Bl -tag -width Ds
298 38e11793 2018-06-13 stsp .It Fl c Ar commit
299 38e11793 2018-06-13 stsp Start traversing history at the specified
300 38e11793 2018-06-13 stsp .Ar commit .
301 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
302 30837e32 2019-07-25 stsp which will be resolved to a commit ID.
303 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
304 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
305 1cc14b9f 2019-05-14 stsp If this option is not specified, default to the work tree's current branch
306 1cc14b9f 2019-05-14 stsp if invoked in a work tree, or to the repository's HEAD reference.
307 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
308 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in diffs with
310 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
312 cc54c501 2019-07-15 stsp Restrict history traversal to the first parent of each commit.
313 cc54c501 2019-07-15 stsp This shows the linear history of the current branch only.
314 cc54c501 2019-07-15 stsp Merge commits which affected the current branch will be shown but
315 cc54c501 2019-07-15 stsp individual commits which originated on other branches will be omitted.
316 6238ee32 2018-06-13 stsp .It Fl l Ar N
317 6238ee32 2018-06-13 stsp Limit history traversal to a given number of commits.
319 6238ee32 2018-06-13 stsp Display the patch of modifications made in each commit.
320 04ca23f4 2018-07-16 stsp .It Fl r Ar repository-path
321 04ca23f4 2018-07-16 stsp Use the repository at the specified path.
322 04ca23f4 2018-07-16 stsp If not specified, assume the repository is located at or above the current
323 04ca23f4 2018-07-16 stsp working directory.
324 e9cf2e30 2019-02-05 stsp If this directory is a
326 e9cf2e30 2019-02-05 stsp work tree, use the repository path associated with this work tree.
328 4ed9f614 2019-08-04 stsp .It Cm diff [ Fl C Ar number ] [ Fl r Ar repository-path ] [ Fl s ] [ Ar object1 Ar object2 | Ar path ]
329 927df6b7 2019-02-10 stsp When invoked within a work tree with less than two arguments, display
330 927df6b7 2019-02-10 stsp uncommitted changes in the work tree.
333 927df6b7 2019-02-10 stsp is specified, only show changes within this path.
335 e02e74af 2019-05-28 stsp If two arguments are provided, treat each argument as a reference,
336 a54b6686 2019-06-28 stsp or an object ID SHA1 hash, and display differences between these objects.
337 3f8b7d6a 2018-04-01 stsp Both objects must be of the same type (blobs, trees, or commits).
338 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
339 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
341 c0cc5c62 2018-10-18 stsp The options for
342 c0cc5c62 2018-10-18 stsp .Cm got diff
343 c0cc5c62 2018-10-18 stsp are as follows:
344 c0cc5c62 2018-10-18 stsp .Bl -tag -width Ds
345 c0cc5c62 2018-10-18 stsp .It Fl C Ar number
346 c0cc5c62 2018-10-18 stsp Set the number of context lines shown in the diff.
347 c0cc5c62 2018-10-18 stsp By default, 3 lines of context are shown.
348 b72f483a 2019-02-05 stsp .It Fl r Ar repository-path
349 b72f483a 2019-02-05 stsp Use the repository at the specified path.
350 b72f483a 2019-02-05 stsp If not specified, assume the repository is located at or above the current
351 b72f483a 2019-02-05 stsp working directory.
352 b72f483a 2019-02-05 stsp If this directory is a
354 b72f483a 2019-02-05 stsp work tree, use the repository path associated with this work tree.
356 4ed9f614 2019-08-04 stsp Show changes staged with
357 4ed9f614 2019-08-04 stsp .Cm got stage
358 4ed9f614 2019-08-04 stsp instead of showing local changes.
359 4ed9f614 2019-08-04 stsp This option is only valid when
360 4ed9f614 2019-08-04 stsp .Cm got diff
361 4ed9f614 2019-08-04 stsp is invoked in a work tree.
364 bc26cce8 2019-08-04 stsp Short alias for
366 1ff8e573 2018-08-02 stsp .It Cm blame [ Fl c Ar commit ] [ Fl r Ar repository-path ] Ar path
367 1ff8e573 2018-08-02 stsp Display line-by-line history of a file at the specified path.
369 1ff8e573 2018-08-02 stsp The options for
370 1ff8e573 2018-08-02 stsp .Cm got blame
371 1ff8e573 2018-08-02 stsp are as follows:
372 1ff8e573 2018-08-02 stsp .Bl -tag -width Ds
373 1ff8e573 2018-08-02 stsp .It Fl c Ar commit
374 1ff8e573 2018-08-02 stsp Start traversing history at the specified
375 1ff8e573 2018-08-02 stsp .Ar commit .
376 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
377 30837e32 2019-07-25 stsp which will be resolved to a commit ID.
378 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
379 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
380 1ff8e573 2018-08-02 stsp .It Fl r Ar repository-path
381 1ff8e573 2018-08-02 stsp Use the repository at the specified path.
382 1ff8e573 2018-08-02 stsp If not specified, assume the repository is located at or above the current
383 1ff8e573 2018-08-02 stsp working directory.
384 0c06baac 2019-02-05 stsp If this directory is a
386 0c06baac 2019-02-05 stsp work tree, use the repository path associated with this work tree.
389 bc26cce8 2019-08-04 stsp Short alias for
390 bc26cce8 2019-08-04 stsp .Cm blame .
391 c1669e2e 2019-01-09 stsp .It Cm tree [ Fl c Ar commit ] [ Fl r Ar repository-path ] [ Fl i ] [ Fl R] [ Ar path ]
392 5de5890b 2018-10-18 stsp Display a listing of files and directories at the specified
393 5de5890b 2018-10-18 stsp directory path in the repository.
394 db0c2996 2019-02-10 stsp Entries shown in this listing may carry one of the following trailing
395 db0c2996 2019-02-10 stsp annotations:
396 db0c2996 2019-02-10 stsp .Bl -column YXZ description
397 db0c2996 2019-02-10 stsp .It / Ta entry is a directory
398 db0c2996 2019-02-10 stsp .It * Ta entry is an executable file
403 0c849583 2019-02-05 stsp is specified, list the repository path corresponding to the current
404 0c849583 2019-02-05 stsp directory of the work tree, or the root directory of the repository
405 0c849583 2019-02-05 stsp if there is no work tree.
407 5de5890b 2018-10-18 stsp The options for
408 5de5890b 2018-10-18 stsp .Cm got tree
409 5de5890b 2018-10-18 stsp are as follows:
410 5de5890b 2018-10-18 stsp .Bl -tag -width Ds
411 5de5890b 2018-10-18 stsp .It Fl c Ar commit
412 5de5890b 2018-10-18 stsp List files and directories as they appear in the specified
413 5de5890b 2018-10-18 stsp .Ar commit .
414 30837e32 2019-07-25 stsp The expected argument is a commit ID SHA1 hash or an existing reference
415 30837e32 2019-07-25 stsp which will be resolved to a commit ID.
416 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
417 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
418 5de5890b 2018-10-18 stsp .It Fl r Ar repository-path
419 5de5890b 2018-10-18 stsp Use the repository at the specified path.
420 5de5890b 2018-10-18 stsp If not specified, assume the repository is located at or above the current
421 5de5890b 2018-10-18 stsp working directory.
422 0c849583 2019-02-05 stsp If this directory is a
424 0c849583 2019-02-05 stsp work tree, use the repository path associated with this work tree.
426 5de5890b 2018-10-18 stsp Show object IDs of files (blob objects) and directories (tree objects).
428 0c849583 2019-02-05 stsp Recurse into sub-directories in the repository.
431 bc26cce8 2019-08-04 stsp Short alias for
433 d83d9d5c 2019-05-13 stsp .It Cm ref [ Fl r Ar repository-path ] [ Fl l ] [ Fl d Ar name ] [ Ar name Ar target ]
434 d0eebce4 2019-03-11 stsp Manage references in a repository.
436 d0eebce4 2019-03-11 stsp If no options are passed, expect two arguments and attempt to create,
437 d0eebce4 2019-03-11 stsp or update, the reference with the given
439 d0eebce4 2019-03-11 stsp and make it point at the given
440 d83d9d5c 2019-05-13 stsp .Ar target .
441 a54b6686 2019-06-28 stsp The target may be an object ID SHA1 hash or an existing reference which
442 a54b6686 2019-06-28 stsp will be resolved to an object ID.
443 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
444 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
446 d0eebce4 2019-03-11 stsp The options for
447 d0eebce4 2019-03-11 stsp .Cm got ref
448 d0eebce4 2019-03-11 stsp are as follows:
449 d0eebce4 2019-03-11 stsp .Bl -tag -width Ds
450 d0eebce4 2019-03-11 stsp .It Fl r Ar repository-path
451 d0eebce4 2019-03-11 stsp Use the repository at the specified path.
452 d0eebce4 2019-03-11 stsp If not specified, assume the repository is located at or above the current
453 d0eebce4 2019-03-11 stsp working directory.
454 d0eebce4 2019-03-11 stsp If this directory is a
456 d0eebce4 2019-03-11 stsp work tree, use the repository path associated with this work tree.
458 d0eebce4 2019-03-11 stsp List all existing references in the repository.
459 d0eebce4 2019-03-11 stsp .It Fl d Ar name
460 d0eebce4 2019-03-11 stsp Delete the reference with the specified name from the repository.
462 4e759de4 2019-06-26 stsp .It Cm branch [ Fl r Ar repository-path ] [ Fl l ] [ Fl d Ar name ] [ Ar name [ Ar base-branch ] ]
463 4e759de4 2019-06-26 stsp Manage branches in a repository.
465 4e759de4 2019-06-26 stsp Branches are managed via references which live in the
466 4e759de4 2019-06-26 stsp .Dq refs/heads/
467 4e759de4 2019-06-26 stsp reference namespace.
469 4e759de4 2019-06-26 stsp .Cm got branch
470 4e759de4 2019-06-26 stsp command operates on references in this namespace only.
472 4e759de4 2019-06-26 stsp If no options are passed, expect one or two arguments and attempt to create
473 4e759de4 2019-06-26 stsp a branch with the given
475 4e759de4 2019-06-26 stsp and make it point at the given
476 4e759de4 2019-06-26 stsp .Ar base-branch .
478 4e759de4 2019-06-26 stsp .Ar base-branch
479 4e759de4 2019-06-26 stsp is specified, default to the work tree's current branch if invoked in a
480 4e759de4 2019-06-26 stsp work tree, or to the repository's HEAD reference.
482 4e759de4 2019-06-26 stsp The options for
483 4e759de4 2019-06-26 stsp .Cm got branch
484 4e759de4 2019-06-26 stsp are as follows:
485 4e759de4 2019-06-26 stsp .Bl -tag -width Ds
486 4e759de4 2019-06-26 stsp .It Fl r Ar repository-path
487 4e759de4 2019-06-26 stsp Use the repository at the specified path.
488 4e759de4 2019-06-26 stsp If not specified, assume the repository is located at or above the current
489 4e759de4 2019-06-26 stsp working directory.
490 4e759de4 2019-06-26 stsp If this directory is a
492 4e759de4 2019-06-26 stsp work tree, use the repository path associated with this work tree.
494 4e759de4 2019-06-26 stsp List all existing branches in the repository.
495 ba882ee3 2019-07-11 stsp If invoked in a work tree, the work tree's current branch is shown
496 ba882ee3 2019-07-11 stsp with one the following annotations:
497 ba882ee3 2019-07-11 stsp .Bl -column YXZ description
498 ba882ee3 2019-07-11 stsp .It * Ta work tree's base commit matches the branch tip
499 ba882ee3 2019-07-11 stsp .It ~ Ta work tree's base commit is out-of-date
501 4e759de4 2019-06-26 stsp .It Fl d Ar name
502 4e759de4 2019-06-26 stsp Delete the branch with the specified name from the repository.
503 7acfb25b 2019-07-11 stsp Only the branch reference is deleted.
504 7acfb25b 2019-07-11 stsp Any commit, tree, and blob objects belonging to the branch
505 74d012d1 2019-07-11 stsp remain in the repository and may be removed separately with
506 ce33d90e 2019-07-14 stsp Git's garbage collector.
509 97b3a7be 2019-07-09 stsp Short alias for
510 97b3a7be 2019-07-09 stsp .Cm branch .
511 fbb7e5c7 2019-05-11 stsp .It Cm add Ar file-path ...
512 8125ddca 2019-05-11 stsp Schedule unversioned files in a work tree for addition to the
513 d00136be 2019-03-26 stsp repository in the next commit.
514 648e4ef7 2019-07-09 stsp .It Cm remove Ar file-path ...
515 17ed4618 2019-06-02 stsp Remove versioned files from a work tree and schedule them for deletion
516 2ec1f75b 2019-03-26 stsp from the repository in the next commit.
518 2ec1f75b 2019-03-26 stsp The options for
519 86d25a1b 2019-07-11 stsp .Cm got remove
520 2ec1f75b 2019-03-26 stsp are as follows:
521 2ec1f75b 2019-03-26 stsp .Bl -tag -width Ds
523 17ed4618 2019-06-02 stsp Perform the operation even if a file contains uncommitted modifications.
526 648e4ef7 2019-07-09 stsp Short alias for
527 648e4ef7 2019-07-09 stsp .Cm remove .
528 33aa809d 2019-08-08 stsp .It Cm revert [ Fl p ] [ Fl F Ar response-script ] [ Fl R ] Ar path ...
529 e20a8b6f 2019-06-04 stsp Revert any uncommited changes in files at the specified paths.
530 a129376b 2019-03-28 stsp File contents will be overwritten with those contained in the
531 a129376b 2019-03-28 stsp work tree's base commit. There is no way to bring discarded
532 a129376b 2019-03-28 stsp changes back after
533 a129376b 2019-03-28 stsp .Cm got revert !
535 e20a8b6f 2019-06-04 stsp If a file was added with
536 a129376b 2019-03-28 stsp .Cm got add
537 a129376b 2019-03-28 stsp it will become an unversioned file again.
538 e20a8b6f 2019-06-04 stsp If a file was deleted with
539 86d25a1b 2019-07-11 stsp .Cm got remove
540 a129376b 2019-03-28 stsp it will be restored.
542 0f6d7415 2019-08-08 stsp The options for
543 0f6d7415 2019-08-08 stsp .Cm got revert
544 0f6d7415 2019-08-08 stsp are as follows:
545 0f6d7415 2019-08-08 stsp .Bl -tag -width Ds
547 33aa809d 2019-08-08 stsp Instead of reverting all changes in files, interactively select or reject
548 33aa809d 2019-08-08 stsp changes to revert based on
550 33aa809d 2019-08-08 stsp (revert change),
552 33aa809d 2019-08-08 stsp (keep change), and
554 33aa809d 2019-08-08 stsp (quit reverting this file) responses.
555 33aa809d 2019-08-08 stsp If a file is in modified status, individual patches derived from the
556 33aa809d 2019-08-08 stsp modified file content can be reverted.
557 33aa809d 2019-08-08 stsp Files in added or deleted status may only be reverted in their entirety.
558 33aa809d 2019-08-08 stsp .It Fl F Ar response-script
561 33aa809d 2019-08-08 stsp option, read
566 33aa809d 2019-08-08 stsp responses line-by-line from the specified
567 33aa809d 2019-08-08 stsp .Ar response-script
568 33aa809d 2019-08-08 stsp file instead of prompting interactively.
570 0f6d7415 2019-08-08 stsp Permit recursion into directories.
571 0f6d7415 2019-08-08 stsp If this option is not specified,
572 0f6d7415 2019-08-08 stsp .Cm got revert
573 0f6d7415 2019-08-08 stsp will refuse to run if a specified
575 0f6d7415 2019-08-08 stsp is a directory.
578 97b3a7be 2019-07-09 stsp Short alias for
579 97b3a7be 2019-07-09 stsp .Cm revert .
580 5c1e53bc 2019-07-28 stsp .It Cm commit [ Fl m Ar message ] [ path ... ]
581 4ed9f614 2019-08-04 stsp Create a new commit in the repository from changes in a work tree
582 15cd91f7 2019-05-12 stsp and use this commit as the new base commit for the work tree.
585 4ed9f614 2019-08-04 stsp is specified, commit all changes in the work tree.
586 4ed9f614 2019-08-04 stsp Otherwise, commit changes at or within the specified paths.
588 4ed9f614 2019-08-04 stsp If changes have been explicitly staged for commit with
589 4ed9f614 2019-08-04 stsp .Cm got stage,
590 4ed9f614 2019-08-04 stsp only commit staged changes and reject any specified paths which
591 4ed9f614 2019-08-04 stsp have not been staged.
593 15cd91f7 2019-05-12 stsp Show the status of each affected file, using the following status codes:
594 15cd91f7 2019-05-12 stsp .Bl -column YXZ description
595 15cd91f7 2019-05-12 stsp .It M Ta modified file
596 15cd91f7 2019-05-12 stsp .It D Ta file was deleted
597 15cd91f7 2019-05-12 stsp .It A Ta new file was added
600 996d5ccd 2019-08-05 stsp Files which are not part of the new commit will retain their previously
601 996d5ccd 2019-08-05 stsp recorded base commit.
604 15cd91f7 2019-05-12 stsp commands may refuse to run while the work tree contains files from
605 15cd91f7 2019-05-12 stsp multiple base commits.
606 15cd91f7 2019-05-12 stsp The base commit of such a work tree can be made consistent by running
607 47ec7be7 2019-05-12 stsp .Cm got update
608 47ec7be7 2019-05-12 stsp across the entire work tree.
611 15cd91f7 2019-05-12 stsp .Cm got commit
612 15cd91f7 2019-05-12 stsp command requires the
613 74416c47 2019-05-09 stsp .Ev GOT_AUTHOR
614 74416c47 2019-05-09 stsp environment variable to be set.
616 74416c47 2019-05-09 stsp The options for
617 74416c47 2019-05-09 stsp .Cm got commit
618 74416c47 2019-05-09 stsp are as follows:
619 74416c47 2019-05-09 stsp .Bl -tag -width Ds
620 74ff3f23 2019-07-07 stsp .It Fl m Ar message
621 74416c47 2019-05-09 stsp Use the specified log message when creating the new commit.
622 23594da9 2019-05-13 stsp Without the
625 23594da9 2019-05-13 stsp .Cm got commit
626 23594da9 2019-05-13 stsp opens a temporary file in an editor where a log message can be written.
629 cfce0458 2019-07-28 stsp .Cm got commit
630 cfce0458 2019-07-28 stsp will refuse to run if certain preconditions are not met.
631 916f288c 2019-07-30 stsp If the work tree's current branch is not in the
632 916f288c 2019-07-30 stsp .Dq refs/heads/
633 916f288c 2019-07-30 stsp reference namespace, new commits may not be created on this branch.
634 cfce0458 2019-07-28 stsp Local changes may only be committed if they are based on file content
635 cfce0458 2019-07-28 stsp found in the most recent commit on the work tree's branch.
636 cfce0458 2019-07-28 stsp If a path is found to be out of date,
637 cfce0458 2019-07-28 stsp .Cm got update
638 cfce0458 2019-07-28 stsp must be used first in order to merge local changes with changes made
639 cfce0458 2019-07-28 stsp in the repository.
641 97b3a7be 2019-07-09 stsp Short alias for
642 97b3a7be 2019-07-09 stsp .Cm commit .
643 234035bc 2019-06-01 stsp .It Cm cherrypick Ar commit
644 234035bc 2019-06-01 stsp Merge changes from a single
646 234035bc 2019-06-01 stsp into the work tree.
647 234035bc 2019-06-01 stsp The specified
649 234035bc 2019-06-01 stsp must be on a different branch than the work tree's base commit.
650 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
651 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
652 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
654 234035bc 2019-06-01 stsp Show the status of each affected file, using the following status codes:
655 234035bc 2019-06-01 stsp .Bl -column YXZ description
656 234035bc 2019-06-01 stsp .It G Ta file was merged
657 234035bc 2019-06-01 stsp .It C Ta file was merged and conflicts occurred during merge
658 234035bc 2019-06-01 stsp .It ! Ta changes destined for a missing file were not merged
659 234035bc 2019-06-01 stsp .It D Ta file was deleted
660 2b92fad7 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
661 234035bc 2019-06-01 stsp .It A Ta new file was added
662 2b92fad7 2019-06-02 stsp .It ~ Ta changes destined for a non-regular file were not merged
665 234035bc 2019-06-01 stsp The merged changes will appear as local changes in the work tree, which
666 234035bc 2019-06-01 stsp may be viewed with
667 234035bc 2019-06-01 stsp .Cm got diff ,
668 234035bc 2019-06-01 stsp amended manually or with further
669 234035bc 2019-06-01 stsp .Cm got cherrypick
671 234035bc 2019-06-01 stsp committed with
672 234035bc 2019-06-01 stsp .Cm got commit ,
673 234035bc 2019-06-01 stsp or discarded again with
674 234035bc 2019-06-01 stsp .Cm got revert .
676 234035bc 2019-06-01 stsp .Cm got cherrypick
677 234035bc 2019-06-01 stsp will refuse to run if certain preconditions are not met.
678 234035bc 2019-06-01 stsp If the work tree contains multiple base commits it must first be updated
679 234035bc 2019-06-01 stsp to a single base commit with
680 234035bc 2019-06-01 stsp .Cm got update .
681 234035bc 2019-06-01 stsp If the work tree already contains files with merge conflicts, these
682 234035bc 2019-06-01 stsp conflicts must be resolved first.
684 97b3a7be 2019-07-09 stsp Short alias for
685 97b3a7be 2019-07-09 stsp .Cm cherrypick .
686 5ef14e63 2019-06-02 stsp .It Cm backout Ar commit
687 5ef14e63 2019-06-02 stsp Reverse-merge changes from a single
689 5ef14e63 2019-06-02 stsp into the work tree.
690 5ef14e63 2019-06-02 stsp The specified
692 5ef14e63 2019-06-02 stsp must be on the same branch as the work tree's base commit.
693 a54b6686 2019-06-28 stsp The expected argument is a reference or a commit ID SHA1 hash.
694 0db75f06 2019-07-07 stsp An abbreviated hash argument will be expanded to a full SHA1 hash
695 0db75f06 2019-07-07 stsp automatically, provided the abbreviation is unique.
697 5ef14e63 2019-06-02 stsp Show the status of each affected file, using the following status codes:
698 5ef14e63 2019-06-02 stsp .Bl -column YXZ description
699 5ef14e63 2019-06-02 stsp .It G Ta file was merged
700 5ef14e63 2019-06-02 stsp .It C Ta file was merged and conflicts occurred during merge
701 5ef14e63 2019-06-02 stsp .It ! Ta changes destined for a missing file were not merged
702 5ef14e63 2019-06-02 stsp .It D Ta file was deleted
703 5ef14e63 2019-06-02 stsp .It d Ta file's deletion was obstructed by local modifications
704 5ef14e63 2019-06-02 stsp .It A Ta new file was added
705 5ef14e63 2019-06-02 stsp .It ~ Ta changes destined for a non-regular file were not merged
708 5ef14e63 2019-06-02 stsp The reverse-merged changes will appear as local changes in the work tree,
709 5ef14e63 2019-06-02 stsp which may be viewed with
710 5ef14e63 2019-06-02 stsp .Cm got diff ,
711 5ef14e63 2019-06-02 stsp amended manually or with further
712 778a73c2 2019-07-12 stsp .Cm got backout
714 5ef14e63 2019-06-02 stsp committed with
715 5ef14e63 2019-06-02 stsp .Cm got commit ,
716 5ef14e63 2019-06-02 stsp or discarded again with
717 5ef14e63 2019-06-02 stsp .Cm got revert .
719 92228c38 2019-06-02 stsp .Cm got backout
720 92228c38 2019-06-02 stsp will refuse to run if certain preconditions are not met.
721 92228c38 2019-06-02 stsp If the work tree contains multiple base commits it must first be updated
722 92228c38 2019-06-02 stsp to a single base commit with
723 92228c38 2019-06-02 stsp .Cm got update .
724 92228c38 2019-06-02 stsp If the work tree already contains files with merge conflicts, these
725 92228c38 2019-06-02 stsp conflicts must be resolved first.
727 97b3a7be 2019-07-09 stsp Short alias for
728 97b3a7be 2019-07-09 stsp .Cm backout .
729 cd98404f 2019-07-14 stsp .It Cm rebase [ Fl a ] [ Fl c] [ Ar branch ]
730 818c7501 2019-07-11 stsp Rebase commits on the specified
732 818c7501 2019-07-11 stsp onto the tip of the current branch of the work tree.
735 818c7501 2019-07-11 stsp must share common ancestry with the work tree's current branch.
736 f09e2405 2019-07-11 stsp Rebasing begins with the first descendent commit of the youngest
737 f09e2405 2019-07-11 stsp common ancestor commit shared by the specified
739 818c7501 2019-07-11 stsp and the work tree's current branch, and stops once the tip commit
740 f09e2405 2019-07-11 stsp of the specified
742 f09e2405 2019-07-11 stsp has been rebased.
744 c6b4581b 2019-07-28 stsp Rebased commits are accumulated on a temporary branch which the work tree
745 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire rebase operation.
746 c6b4581b 2019-07-28 stsp Commits on this branch represent the same changes with the same log
747 c6b4581b 2019-07-28 stsp messages as their counterparts on the original
748 818c7501 2019-07-11 stsp .Ar branch ,
749 818c7501 2019-07-11 stsp but with different commit IDs.
750 818c7501 2019-07-11 stsp Once rebasing has completed successfully, the temporary branch becomes
751 f09e2405 2019-07-11 stsp the new version of the specified
753 818c7501 2019-07-11 stsp and the work tree is automatically switched to it.
755 818c7501 2019-07-11 stsp While rebasing commits, show the status of each affected file,
756 818c7501 2019-07-11 stsp using the following status codes:
757 818c7501 2019-07-11 stsp .Bl -column YXZ description
758 818c7501 2019-07-11 stsp .It G Ta file was merged
759 818c7501 2019-07-11 stsp .It C Ta file was merged and conflicts occurred during merge
760 818c7501 2019-07-11 stsp .It ! Ta changes destined for a missing file were not merged
761 818c7501 2019-07-11 stsp .It D Ta file was deleted
762 818c7501 2019-07-11 stsp .It d Ta file's deletion was obstructed by local modifications
763 818c7501 2019-07-11 stsp .It A Ta new file was added
764 818c7501 2019-07-11 stsp .It ~ Ta changes destined for a non-regular file were not merged
767 f09e2405 2019-07-11 stsp If merge conflicts occur the rebase operation is interrupted and may
768 f09e2405 2019-07-11 stsp be continued once conflicts have been resolved.
769 818c7501 2019-07-11 stsp Alternatively, the rebase operation may be aborted which will leave
771 818c7501 2019-07-11 stsp unmodified and the work tree switched back to its original branch.
773 ff0d2220 2019-07-11 stsp If a merge conflict is resolved in a way which renders the merged
774 f09e2405 2019-07-11 stsp change into a no-op change, the corresponding commit will be elided
775 f09e2405 2019-07-11 stsp when the rebase operation continues.
777 818c7501 2019-07-11 stsp .Cm got rebase
778 818c7501 2019-07-11 stsp will refuse to run if certain preconditions are not met.
779 818c7501 2019-07-11 stsp If the work tree contains multiple base commits it must first be updated
780 818c7501 2019-07-11 stsp to a single base commit with
781 818c7501 2019-07-11 stsp .Cm got update .
782 4ed9f614 2019-08-04 stsp If changes have been staged with
783 4ed9f614 2019-08-04 stsp .Cm got stage ,
784 4ed9f614 2019-08-04 stsp these changes must first be comitted with
785 4ed9f614 2019-08-04 stsp .Cm got commit
786 4ed9f614 2019-08-04 stsp or unstaged with
787 4ed9f614 2019-08-04 stsp .Cm got unstage .
788 f09e2405 2019-07-11 stsp If the work tree contains local changes, these changes must first be
789 f09e2405 2019-07-11 stsp committed with
790 f09e2405 2019-07-11 stsp .Cm got commit
791 f09e2405 2019-07-11 stsp or reverted with
792 f09e2405 2019-07-11 stsp .Cm got revert .
795 64c6d990 2019-07-11 stsp contains changes to files outside of the work tree's path prefix,
796 64c6d990 2019-07-11 stsp the work tree cannot be used to rebase this branch.
799 7d5807f4 2019-07-11 stsp .Cm got update
801 7d5807f4 2019-07-11 stsp .Cm got commit
802 7d5807f4 2019-07-11 stsp commands will refuse to run while a rebase operation is in progress.
803 7d5807f4 2019-07-11 stsp Other commands which manipulate the work tree may be used for
804 7d5807f4 2019-07-11 stsp conflict resolution purposes.
806 818c7501 2019-07-11 stsp The options for
807 818c7501 2019-07-11 stsp .Cm got rebase
808 818c7501 2019-07-11 stsp are as follows:
809 818c7501 2019-07-11 stsp .Bl -tag -width Ds
811 818c7501 2019-07-11 stsp Abort an interrupted rebase operation.
812 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
814 06067b48 2019-07-11 stsp Continue an interrupted rebase operation.
815 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
818 818c7501 2019-07-11 stsp Short alias for
819 818c7501 2019-07-11 stsp .Cm rebase .
820 0ebf8283 2019-07-24 stsp .It Cm histedit [ Fl a ] [ Fl c] [ Fl F Ar histedit-script ]
821 0ebf8283 2019-07-24 stsp Edit commit history between the work tree's current base commit and
822 0ebf8283 2019-07-24 stsp the tip commit of the work tree's current branch.
824 0ebf8283 2019-07-24 stsp Editing of commit history is controlled via a
825 0ebf8283 2019-07-24 stsp .Ar histedit script
826 0ebf8283 2019-07-24 stsp which can be edited interactively or passed on the command line.
827 0ebf8283 2019-07-24 stsp The format of the histedit script is line-based.
828 0ebf8283 2019-07-24 stsp Each line in the script begins with a command name, followed by
829 0ebf8283 2019-07-24 stsp whitespace and an argument.
830 0ebf8283 2019-07-24 stsp For most commands, the expected argument is a commit ID SHA1 hash.
831 0ebf8283 2019-07-24 stsp Any remaining text on the line is ignored.
832 0ebf8283 2019-07-24 stsp Lines which begin with the
834 0ebf8283 2019-07-24 stsp character are ignored entirely.
836 0ebf8283 2019-07-24 stsp The available commands are as follows:
837 0ebf8283 2019-07-24 stsp .Bl -column YXZ pick-commit
838 0ebf8283 2019-07-24 stsp .It pick Ar commit Ta Use the specified commit as it is.
839 a698f62e 2019-07-25 stsp .It edit Ar commit Ta Use the specified commit but once changes have been
840 0ebf8283 2019-07-24 stsp merged into the work tree interrupt the histedit operation for amending.
841 0ebf8283 2019-07-24 stsp .It fold Ar commit Ta Combine the specified commit with the next commit
842 0ebf8283 2019-07-24 stsp listed further below that will be used.
843 0ebf8283 2019-07-24 stsp .It drop Ar commit Ta Remove this commit from the edited history.
844 0ebf8283 2019-07-24 stsp .It mesg Ar log-message Ta Use the specified single-line log message for
845 0ebf8283 2019-07-24 stsp the commit on the previous line.
846 0ebf8283 2019-07-24 stsp If the log message argument is left empty, open an editor where a new
847 0ebf8283 2019-07-24 stsp log message can be written.
850 ba67992e 2019-07-25 stsp Every commit in the history being edited must be mentioned in the script.
851 0ebf8283 2019-07-24 stsp Lines may be re-ordered to change the order of commits in the edited history.
853 c6b4581b 2019-07-28 stsp Edited commits are accumulated on a temporary branch which the work tree
854 c6b4581b 2019-07-28 stsp will remain switched to throughout the entire histedit operation.
855 0ebf8283 2019-07-24 stsp Once history editing has completed successfully, the temporary branch becomes
856 498a90b7 2019-07-25 stsp the new version of the work tree's branch and the work tree is automatically
857 498a90b7 2019-07-25 stsp switched to it.
859 0ebf8283 2019-07-24 stsp While merging commits, show the status of each affected file,
860 0ebf8283 2019-07-24 stsp using the following status codes:
861 0ebf8283 2019-07-24 stsp .Bl -column YXZ description
862 0ebf8283 2019-07-24 stsp .It G Ta file was merged
863 0ebf8283 2019-07-24 stsp .It C Ta file was merged and conflicts occurred during merge
864 0ebf8283 2019-07-24 stsp .It ! Ta changes destined for a missing file were not merged
865 0ebf8283 2019-07-24 stsp .It D Ta file was deleted
866 0ebf8283 2019-07-24 stsp .It d Ta file's deletion was obstructed by local modifications
867 0ebf8283 2019-07-24 stsp .It A Ta new file was added
868 0ebf8283 2019-07-24 stsp .It ~ Ta changes destined for a non-regular file were not merged
871 0ebf8283 2019-07-24 stsp If merge conflicts occur the histedit operation is interrupted and may
872 0ebf8283 2019-07-24 stsp be continued once conflicts have been resolved.
873 0ebf8283 2019-07-24 stsp Alternatively, the histedit operation may be aborted which will leave
874 0ebf8283 2019-07-24 stsp the work tree switched back to its original branch.
876 0ebf8283 2019-07-24 stsp If a merge conflict is resolved in a way which renders the merged
877 0ebf8283 2019-07-24 stsp change into a no-op change, the corresponding commit will be elided
878 0ebf8283 2019-07-24 stsp when the histedit operation continues.
880 0ebf8283 2019-07-24 stsp .Cm got histedit
881 0ebf8283 2019-07-24 stsp will refuse to run if certain preconditions are not met.
882 c7d20a3f 2019-07-30 stsp If the work tree's current branch is not in the
883 c7d20a3f 2019-07-30 stsp .Dq refs/heads/
884 c7d20a3f 2019-07-30 stsp reference namespace, the history of the branch may not be edited.
885 0ebf8283 2019-07-24 stsp If the work tree contains multiple base commits it must first be updated
886 0ebf8283 2019-07-24 stsp to a single base commit with
887 0ebf8283 2019-07-24 stsp .Cm got update .
888 4ed9f614 2019-08-04 stsp If changes have been staged with
889 4ed9f614 2019-08-04 stsp .Cm got stage ,
890 4ed9f614 2019-08-04 stsp these changes must first be comitted with
891 4ed9f614 2019-08-04 stsp .Cm got commit
892 4ed9f614 2019-08-04 stsp or unstaged with
893 4ed9f614 2019-08-04 stsp .Cm got unstage .
894 0ebf8283 2019-07-24 stsp If the work tree contains local changes, these changes must first be
895 0ebf8283 2019-07-24 stsp committed with
896 0ebf8283 2019-07-24 stsp .Cm got commit
897 0ebf8283 2019-07-24 stsp or reverted with
898 0ebf8283 2019-07-24 stsp .Cm got revert .
899 0ebf8283 2019-07-24 stsp If the edited history contains changes to files outside of the work tree's
900 0ebf8283 2019-07-24 stsp path prefix, the work tree cannot be used to edit the history of this branch.
903 0ebf8283 2019-07-24 stsp .Cm got update
904 a698f62e 2019-07-25 stsp command will refuse to run while a histedit operation is in progress.
905 a698f62e 2019-07-25 stsp Other commands which manipulate the work tree may be used, and the
906 0ebf8283 2019-07-24 stsp .Cm got commit
907 a698f62e 2019-07-25 stsp command may be used to commit arbitrary changes to the temporary branch
908 a698f62e 2019-07-25 stsp while the histedit operation is interrupted.
910 0ebf8283 2019-07-24 stsp The options for
911 0ebf8283 2019-07-24 stsp .Cm got histedit
912 0ebf8283 2019-07-24 stsp are as follows:
913 0ebf8283 2019-07-24 stsp .Bl -tag -width Ds
915 0ebf8283 2019-07-24 stsp Abort an interrupted histedit operation.
916 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
918 0ebf8283 2019-07-24 stsp Continue an interrupted histedit operation.
919 c478f6d8 2019-08-08 stsp If this option is used, no other command-line arguments are allowed.
922 0ebf8283 2019-07-24 stsp Short alias for
923 0ebf8283 2019-07-24 stsp .Cm histedit .
924 3a070a2b 2019-08-07 stsp .It Cm stage [ Fl l ] [ Fl p ] [ Fl F Ar response-script ] [ Ar path ... ]
925 2db2652d 2019-08-07 stsp Stage local changes for inclusion in the next commit.
928 2db2652d 2019-08-07 stsp is specified, stage all changes in the work tree.
929 2db2652d 2019-08-07 stsp Otherwise, stage changes at or within the specified paths.
930 4ed9f614 2019-08-04 stsp Paths may be staged if they are added, modified, or deleted according to
931 4ed9f614 2019-08-04 stsp .Cm got status .
933 9d8b19a4 2019-08-04 stsp Show the status of each affected file, using the following status codes:
934 9d8b19a4 2019-08-04 stsp .Bl -column YXZ description
935 9d8b19a4 2019-08-04 stsp .It A Ta file addition has been staged
936 9d8b19a4 2019-08-04 stsp .It M Ta file modification has been staged
937 9d8b19a4 2019-08-04 stsp .It D Ta file deletion has been staged
940 9d8b19a4 2019-08-04 stsp Staged file contents are saved in newly created blob objects in the repository.
941 52c8d4ac 2019-08-04 stsp These blobs will be referred to by tree objects once staged changes have been
944 890ea719 2019-08-04 stsp Staged changes affect the behaviour of
945 4ed9f614 2019-08-04 stsp .Cm got commit ,
946 4ed9f614 2019-08-04 stsp .Cm got status ,
948 4ed9f614 2019-08-04 stsp .Cm got diff .
949 4ed9f614 2019-08-04 stsp While paths with staged changes exist, the
950 4ed9f614 2019-08-04 stsp .Cm got commit
951 4ed9f614 2019-08-04 stsp command will refuse to commit any paths which do not have staged changes.
952 4ed9f614 2019-08-04 stsp Local changes created on top of staged changes can only be committed if
953 4ed9f614 2019-08-04 stsp the path is staged again, or if the staged changes are committed first.
955 4ed9f614 2019-08-04 stsp .Cm got status
956 4ed9f614 2019-08-04 stsp command will show both local changes and staged changes.
958 4ed9f614 2019-08-04 stsp .Cm got diff
959 ecf14362 2019-08-04 stsp command is able to display local changes relative to staged changes,
960 ecf14362 2019-08-04 stsp and to display staged changes relative to the repository.
962 4ed9f614 2019-08-04 stsp .Cm got revert
963 4ed9f614 2019-08-04 stsp command cannot revert staged changes but may be used to revert
964 4f2494e6 2019-08-08 stsp local changes created on top of staged changes.
966 4ed9f614 2019-08-04 stsp The options for
967 4ed9f614 2019-08-04 stsp .Cm got stage
968 4ed9f614 2019-08-04 stsp are as follows:
969 4ed9f614 2019-08-04 stsp .Bl -tag -width Ds
971 4ed9f614 2019-08-04 stsp Instead of staging new changes, list paths which are already staged,
972 9d8b19a4 2019-08-04 stsp along with the IDs of staged blob objects and stage status codes.
973 9d8b19a4 2019-08-04 stsp If paths were provided in the command line show the staged paths
974 9d8b19a4 2019-08-04 stsp among the specified paths. Otherwise, show all staged paths.
976 dc424a06 2019-08-07 stsp Instead of staging the entire content of a changed file, interactively
977 dc424a06 2019-08-07 stsp select or reject changes for staging based on
979 6d23ec10 2019-08-08 stsp (stage change),
981 6d23ec10 2019-08-08 stsp (reject change), and
983 6d23ec10 2019-08-08 stsp (quit staging this file) responses.
984 dc424a06 2019-08-07 stsp If a file is in modified status, individual patches derived from the
985 dc424a06 2019-08-07 stsp modified file content can be staged.
986 6d23ec10 2019-08-08 stsp Files in added or deleted status may only be staged or rejected in
987 6d23ec10 2019-08-08 stsp their entirety.
988 3a070a2b 2019-08-07 stsp .It Fl F Ar response-script
991 3a070a2b 2019-08-07 stsp option, read
996 0e2f5884 2019-08-07 stsp responses line-by-line from the specified
997 0e2f5884 2019-08-07 stsp .Ar response-script
998 0e2f5884 2019-08-07 stsp file instead of prompting interactively.
1001 4ed9f614 2019-08-04 stsp .Cm got stage
1002 4ed9f614 2019-08-04 stsp will refuse to run if certain preconditions are not met.
1003 4ed9f614 2019-08-04 stsp If a file contains merge conflicts, these conflicts must be resolved first.
1004 4ed9f614 2019-08-04 stsp If a file is found to be out of date relative to the head commit on the
1005 4ed9f614 2019-08-04 stsp work tree's current branch, the file must be updated with
1006 4ed9f614 2019-08-04 stsp .Cm got update
1007 4ed9f614 2019-08-04 stsp before it can be staged (however, this does not prevent the file from
1008 4ed9f614 2019-08-04 stsp becoming out-of-date at some point after having been staged).
1011 4ed9f614 2019-08-04 stsp .Cm got update ,
1012 4ed9f614 2019-08-04 stsp .Cm got rebase ,
1014 4ed9f614 2019-08-04 stsp .Cm got histedit
1015 4ed9f614 2019-08-04 stsp commands will refuse to run while staged changes exist.
1016 4ed9f614 2019-08-04 stsp If staged changes cannot be committed because a staged path
1017 4ed9f614 2019-08-04 stsp is out of date, the path must be unstaged with
1018 4ed9f614 2019-08-04 stsp .Cm got unstage
1019 4ed9f614 2019-08-04 stsp before it can be updated with
1020 4ed9f614 2019-08-04 stsp .Cm got update ,
1021 4ed9f614 2019-08-04 stsp and may then be staged again if necessary.
1023 4ed9f614 2019-08-04 stsp Short alias for
1024 4ed9f614 2019-08-04 stsp .Cm stage .
1025 2e1f37b0 2019-08-08 stsp .It Cm unstage [ Fl p ] [ Fl F Ar response-script ] [ Ar path ... ]
1026 4ed9f614 2019-08-04 stsp Merge staged changes back into the work tree and put affected paths
1027 4ed9f614 2019-08-04 stsp back into non-staged status.
1030 4ed9f614 2019-08-04 stsp is specified, unstage all staged changes across the entire work tree.
1031 2db2652d 2019-08-07 stsp Otherwise, unstage changes at or within the specified paths.
1033 4ed9f614 2019-08-04 stsp Show the status of each affected file, using the following status codes:
1034 4ed9f614 2019-08-04 stsp .Bl -column YXZ description
1035 4ed9f614 2019-08-04 stsp .It G Ta file was unstaged
1036 4ed9f614 2019-08-04 stsp .It C Ta file was unstaged and conflicts occurred during merge
1037 4ed9f614 2019-08-04 stsp .It ! Ta changes destined for a missing file were not merged
1038 4ed9f614 2019-08-04 stsp .It D Ta file was staged as deleted and still is deleted
1039 4ed9f614 2019-08-04 stsp .It d Ta file's deletion was obstructed by local modifications
1040 4ed9f614 2019-08-04 stsp .It ~ Ta changes destined for a non-regular file were not merged
1043 2e1f37b0 2019-08-08 stsp The options for
1044 2e1f37b0 2019-08-08 stsp .Cm got unstage
1045 2e1f37b0 2019-08-08 stsp are as follows:
1046 2e1f37b0 2019-08-08 stsp .Bl -tag -width Ds
1048 2e1f37b0 2019-08-08 stsp Instead of unstaging the entire content of a changed file, interactively
1049 2e1f37b0 2019-08-08 stsp select or reject changes for unstaging based on
1051 2e1f37b0 2019-08-08 stsp (unstage change),
1053 2e1f37b0 2019-08-08 stsp (keep change staged), and
1055 2e1f37b0 2019-08-08 stsp (quit unstaging this file) responses.
1056 2e1f37b0 2019-08-08 stsp If a file is staged in modified status, individual patches derived from the
1057 2e1f37b0 2019-08-08 stsp staged file content can be unstaged.
1058 2e1f37b0 2019-08-08 stsp Files staged in added or deleted status may only be unstaged in their entirety.
1059 2e1f37b0 2019-08-08 stsp .It Fl F Ar response-script
1062 2e1f37b0 2019-08-08 stsp option, read
1067 2e1f37b0 2019-08-08 stsp responses line-by-line from the specified
1068 2e1f37b0 2019-08-08 stsp .Ar response-script
1069 2e1f37b0 2019-08-08 stsp file instead of prompting interactively.
1072 4ed9f614 2019-08-04 stsp Short alias for
1073 4ed9f614 2019-08-04 stsp .Cm unstage .
1075 74416c47 2019-05-09 stsp .Sh ENVIRONMENT
1076 74416c47 2019-05-09 stsp .Bl -tag -width GOT_AUTHOR
1077 74416c47 2019-05-09 stsp .It Ev GOT_AUTHOR
1078 74416c47 2019-05-09 stsp The author's name and email address for
1079 21a44f98 2019-07-15 stsp .Cm got commit
1081 21a44f98 2019-07-15 stsp .Cm got import ,
1082 74416c47 2019-05-09 stsp for example:
1083 0e444aba 2019-08-08 stsp .An Flan Hacker Aq Mt flan_hacker@openbsd.org .
1085 0e444aba 2019-08-08 stsp may fail to parse commits created with
1088 0e444aba 2019-08-08 stsp .Ev GOT_AUTHOR
1089 0e444aba 2019-08-08 stsp environment variable does not contain an email address.
1090 23594da9 2019-05-13 stsp .It Ev VISUAL, Ev EDITOR
1091 23594da9 2019-05-13 stsp The editor spawned by
1092 23594da9 2019-05-13 stsp .Cm got commit .
1094 5c860e29 2018-03-12 stsp .Sh EXIT STATUS
1095 5c860e29 2018-03-12 stsp .Ex -std got
1096 97925469 2018-03-17 stsp .Sh EXAMPLES
1097 fa6e0e48 2019-05-23 stsp Clone an existing Git repository for use with
1099 fa6e0e48 2019-05-23 stsp This step currently requires
1100 fa6e0e48 2019-05-23 stsp .Xr git 1 :
1102 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/
1103 fa6e0e48 2019-05-23 stsp .Dl $ git clone --bare https://github.com/openbsd/src.git
1105 3ce1b845 2019-07-15 stsp Alternatively, for quick and dirty local testing of
1107 3ce1b845 2019-07-15 stsp a new Git repository could be created and populated with files,
1108 3ce1b845 2019-07-15 stsp e.g. from a temporary CVS checkout located at
1109 3ce1b845 2019-07-15 stsp .Pa /tmp/src :
1111 3ce1b845 2019-07-15 stsp .Dl $ got init /var/git/src.git
1112 2930ef13 2019-07-15 stsp .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
1114 3ce1b845 2019-07-15 stsp Check out a work tree from the Git repository to /usr/src:
1116 fa6e0e48 2019-05-23 stsp .Dl $ got checkout /var/git/src.git /usr/src
1118 e70c17ce 2019-05-22 stsp View local changes in a work tree directory:
1120 e70c17ce 2019-05-22 stsp .Dl $ got status
1121 e70c17ce 2019-05-22 stsp .Dl $ got diff | less
1123 33aa809d 2019-08-08 stsp Interactively revert selected local changes in a work tree directory:
1125 33aa809d 2019-08-08 stsp .Dl $ got revert -p -R\ .
1127 e70c17ce 2019-05-22 stsp In a work tree or a git repository directory, list all branch references:
1129 4e759de4 2019-06-26 stsp .Dl $ got branch -l
1131 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, create a new branch called
1132 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache
1133 d83d9d5c 2019-05-13 stsp which is forked off the
1134 d83d9d5c 2019-05-13 stsp .Dq master
1137 4e759de4 2019-06-26 stsp .Dl $ got branch unified-buffer-cache master
1139 e70c17ce 2019-05-22 stsp Switch an existing work tree to the branch
1140 e70c17ce 2019-05-22 stsp .Dq unified-buffer-cache .
1141 e70c17ce 2019-05-22 stsp Local changes in the work tree will be preserved and merged if necessary:
1143 e70c17ce 2019-05-22 stsp .Dl $ got update -b unified-buffer-cache
1145 fa6e0e48 2019-05-23 stsp Create a new commit from local changes in a work tree directory.
1146 fa6e0e48 2019-05-23 stsp This new commit will become the head commit of the work tree's current branch:
1148 fa6e0e48 2019-05-23 stsp .Dl $ got commit
1150 fa6e0e48 2019-05-23 stsp In a work tree or a git repository directory, view changes committed in
1151 fa6e0e48 2019-05-23 stsp the 3 most recent commits to the work tree's branch, or the branch resolved
1152 fa6e0e48 2019-05-23 stsp via the repository's HEAD reference, respectively:
1154 cc54c501 2019-07-15 stsp .Dl $ got log -p -l 3 -f
1156 e70c17ce 2019-05-22 stsp Add new files and remove obsolete files in a work tree directory:
1158 fa6e0e48 2019-05-23 stsp .Dl $ got add sys/uvm/uvm_ubc.c
1159 86d25a1b 2019-07-11 stsp .Dl $ got remove sys/uvm/uvm_vnode.c
1161 e70c17ce 2019-05-22 stsp Create a new commit from local changes in a work tree directory
1162 e70c17ce 2019-05-22 stsp with a pre-defined log message.
1164 e70c17ce 2019-05-22 stsp .Dl $ got commit -m 'unify the buffer cache'
1166 95fc3404 2019-07-15 stsp Update any work tree checked out from the
1167 95fc3404 2019-07-15 stsp .Dq unified-buffer-cache
1168 95fc3404 2019-07-15 stsp branch to the latest commit on this branch:
1170 95fc3404 2019-07-15 stsp .Dl $ got update
1172 c991308a 2019-07-15 stsp Roll file content on the unified-buffer-cache branch back by one commit,
1173 c991308a 2019-07-15 stsp and then fetch the rolled-back change into the work tree as a local change
1174 ac90e726 2019-07-15 stsp to be amended and perhaps committed again:
1176 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1177 ac90e726 2019-07-15 stsp .Dl $ got commit -m 'roll back previous'
1178 59d52b88 2019-07-15 stsp .Dl $ # now back out the previous backout :-)
1179 ac90e726 2019-07-15 stsp .Dl $ got backout unified-buffer-cache
1181 9221fb1e 2019-06-26 stsp Fetch new upstream commits into the local repository's master branch.
1182 9221fb1e 2019-06-26 stsp This step currently requires
1183 9221fb1e 2019-06-26 stsp .Xr git 1 :
1185 fa6e0e48 2019-05-23 stsp .Dl $ cd /var/git/src.git
1186 fa6e0e48 2019-05-23 stsp .Dl $ git fetch origin master:master
1188 fa6e0e48 2019-05-23 stsp Rebase the
1189 fa6e0e48 2019-05-23 stsp .Dq unified-buffer-cache
1190 fa6e0e48 2019-05-23 stsp branch on top of the new head commit of the
1191 fa6e0e48 2019-05-23 stsp .Dq master
1194 818c7501 2019-07-11 stsp .Dl $ got update -b master
1195 818c7501 2019-07-11 stsp .Dl $ got rebase unified-buffer-cache
1197 7d7ffedb 2019-07-14 stsp Create a patch from all changes on the unified-buffer-cache branch.
1198 7d7ffedb 2019-07-14 stsp The patch can be mailed out for review and applied to OpenBSD's CVS tree:
1200 7d7ffedb 2019-07-14 stsp .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
1202 0ebf8283 2019-07-24 stsp Edit the entire commit history of the
1203 0ebf8283 2019-07-24 stsp .Dq unified-buffer-cache
1206 0ebf8283 2019-07-24 stsp .Dl $ got update -b unified-buffer-cache
1207 0ebf8283 2019-07-24 stsp .Dl $ got update -c master
1208 0ebf8283 2019-07-24 stsp .Dl $ got histedit
1210 7b3fde24 2019-07-28 stsp Additional steps are necessary if local changes need to be pushed back
1211 7b3fde24 2019-07-28 stsp to the remote repository, which currently requires
1212 7b3fde24 2019-07-28 stsp .Cm git fetch
1214 7b3fde24 2019-07-28 stsp .Cm git push .
1215 ff2cf171 2019-07-28 stsp Before working against existing branches in a repository cloned with
1216 ff2cf171 2019-07-28 stsp .Dq git clone --bare ,
1218 ff2cf171 2019-07-28 stsp .Dq refspec
1219 ff2cf171 2019-07-28 stsp must be configured to map all references in the remote repository
1221 ff2cf171 2019-07-28 stsp .Dq refs/remotes
1222 ff2cf171 2019-07-28 stsp namespace of the local repository.
1223 ff2cf171 2019-07-28 stsp This can achieved by setting Git's
1224 ff2cf171 2019-07-28 stsp .Pa remote.origin.fetch
1225 ff2cf171 2019-07-28 stsp configuration variable to the value
1226 ff2cf171 2019-07-28 stsp .Dq +refs/heads/*:refs/remotes/origin/*
1228 ff2cf171 2019-07-28 stsp .Cm git config
1231 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1232 ff2cf171 2019-07-28 stsp .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
1234 ff2cf171 2019-07-28 stsp Alternatively, the following
1236 ff2cf171 2019-07-28 stsp configuration item can be added manually to the Git repository's
1237 ff2cf171 2019-07-28 stsp .Pa config
1240 ff2cf171 2019-07-28 stsp .Dl [remote "origin"]
1241 ff2cf171 2019-07-28 stsp .Dl url = ...
1242 ff2cf171 2019-07-28 stsp .Dl fetch = +refs/heads/*:refs/remotes/origin/*
1244 fe307c9b 2019-07-28 stsp This configuration leaves the local repository's
1245 ff2cf171 2019-07-28 stsp .Dq refs/heads
1246 ff2cf171 2019-07-28 stsp namespace free for use by local branches checked out with
1247 ff2cf171 2019-07-28 stsp .Cm got checkout
1248 ff2cf171 2019-07-28 stsp and, if needed, created with
1249 ff2cf171 2019-07-28 stsp .Cm got branch .
1251 ff2cf171 2019-07-28 stsp Branches in the
1252 ff2cf171 2019-07-28 stsp .Dq remotes/origin
1253 ff2cf171 2019-07-28 stsp namespace can be updated with incoming changes from the remote
1254 ff2cf171 2019-07-28 stsp repository with
1255 ff2cf171 2019-07-28 stsp .Cm git fetch :
1257 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1258 ff2cf171 2019-07-28 stsp .Dl $ git fetch
1260 ff2cf171 2019-07-28 stsp Before outgoing changes on the local
1261 ff2cf171 2019-07-28 stsp .Dq master
1262 ff2cf171 2019-07-28 stsp branch can be pushed to the remote repository, the local
1263 ff2cf171 2019-07-28 stsp .Dq master
1264 ff2cf171 2019-07-28 stsp branch must be rebased onto the
1265 ff2cf171 2019-07-28 stsp .Dq origin/master
1268 ff2cf171 2019-07-28 stsp .Dl $ got update -b origin/master
1269 ff2cf171 2019-07-28 stsp .Dl $ got rebase master
1271 ff2cf171 2019-07-28 stsp Changes on the local
1272 ff2cf171 2019-07-28 stsp .Dq master
1273 ff2cf171 2019-07-28 stsp branch can then be pushed to the remote
1274 ff2cf171 2019-07-28 stsp repository with
1275 ff2cf171 2019-07-28 stsp .Cm git push :
1277 ff2cf171 2019-07-28 stsp .Dl $ cd /var/git/repo
1278 ff2cf171 2019-07-28 stsp .Dl $ git push origin master
1280 5c860e29 2018-03-12 stsp .Sh SEE ALSO
1281 2312fc47 2019-07-15 stsp .Xr tog 1 ,
1282 2312fc47 2019-07-15 stsp .Xr git-repository 5 ,
1283 285dc8a4 2018-03-13 stsp .Xr got-worktree 5
1284 1a208aaf 2018-04-01 stsp .Sh AUTHORS
1285 1a208aaf 2018-04-01 stsp .An Stefan Sperling Aq Mt stsp@openbsd.org
1286 1a208aaf 2018-04-01 stsp .An Martin Pieuchot Aq Mt mpi@openbsd.org
1287 72e28b48 2019-05-14 stsp .An joshua stein Aq Mt jcs@openbsd.org
1288 fa6e0e48 2019-05-23 stsp .Sh CAVEATS
1290 fa6e0e48 2019-05-23 stsp is a work-in-progress and many commands remain to be implemented.
1291 fa6e0e48 2019-05-23 stsp At present, the user has to fall back on
1293 ff2cf171 2019-07-28 stsp to perform many tasks, in particular tasks related to repository
1294 ff2cf171 2019-07-28 stsp administration and tasks which require a network connection.
