2 .\" Copyright (c) 2017 Martin Pieuchot
3 .\" Copyright (c) 2018, 2019, 2020 Stefan Sperling
5 .\" Permission to use, copy, modify, and distribute this software for any
6 .\" purpose with or without fee is hereby granted, provided that the above
7 .\" copyright notice and this permission notice appear in all copies.
9 .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
30 is a version control system which stores the history of tracked files
31 in a Git repository, as used by the Git version control system.
32 This repository format is described in
33 .Xr git-repository 5 .
38 version control system because every copy of a repository is writeable.
39 Modifications made to files can be synchronized between repositories
44 must be checked out from the repository for modification.
45 Checked out files are stored in a
47 which can be placed at an arbitrary directory in the filesystem hierarchy.
48 The on-disk format of this work tree is described in
52 provides global and command-specific options.
53 Global options must precede the command name, and are as follows:
54 .Bl -tag -width tenletters
56 Display usage information and exit immediately.
58 Display program version and exit immediately.
64 .Bl -tag -width checkout
71 .Op Fl r Ar repository-path
75 Create an initial commit in a repository from the file hierarchy
78 The created commit will not have any parent commits, i.e. it will be a
80 Also create a new reference which provides a branch name for the newly
82 Show the path of each imported file to indicate progress.
88 environment variable to be set,
89 unless an author has been configured in
95 configuration settings can be obtained from the repository's
97 file or from Git's global
108 If this option is not specified, a branch corresponding to the repository's
109 HEAD reference will be used.
110 Use of this option is required if the branch resolved via the repository's
111 HEAD reference already exists.
113 Ignore files or directories with a name which matches the specified
115 This option may be specified multiple times to build a list of ignore patterns.
118 follows the globbing rules documented in
121 Use the specified log message when creating the new commit.
126 opens a temporary file in an editor where a log message can be written.
127 .It Fl r Ar repository-path
128 Use the repository at the specified path.
129 If not specified, assume the repository is located at or above the current
137 .Op Fl R Ar reference
142 Clone a Git repository at the specified
148 is specified, the directory name will be derived from the name of the
151 will refuse to run if the
157 specifies a protocol scheme, a server hostname, an optional port number
158 separated from the hostname by a colon, and a path to the repository on
160 .Lk scheme://hostname:port/path/to/repository
162 The following protocol schemes are supported:
163 .Bl -tag -width git+ssh
165 The Git protocol as implemented by the
168 Use of this protocol is discouraged since it supports neither authentication
171 The Git protocol wrapped in an authenticated and encrypted
174 With this protocol the hostname may contain an embedded username for
179 Short alias for git+ssh.
182 Objects in the cloned repository are stored in a pack file which is downloaded
184 This pack file will then be indexed to facilitate access to the objects stored
186 If any objects in the pack file are stored in deltified form, all deltas will
187 be fully resolved in order to compute the ID of such objects.
188 This can take some time.
189 More details about the pack file format are documented in
190 .Xr git-repository 5 .
193 creates a remote repository entry in the
197 files of the cloned repository to store the
203 arguments for future use by
213 Fetch all branches from the remote repository's
215 reference namespace and set
216 .Cm fetch_all_branches
217 in the cloned repository's
219 file for future use by
221 If this option is not specified, a branch resolved via the remote
222 repository's HEAD reference will be fetched.
223 Cannot be used together with the
229 from the remote repository's
232 This option may be specified multiple times to build a list of branches
234 If the branch corresponding to the remote repository's HEAD reference is not
235 in this list, the cloned repository's HEAD reference will be set to the first
236 branch which was fetched.
237 If this option is not specified, a branch resolved via the remote
238 repository's HEAD reference will be fetched.
239 Cannot be used together with the
243 List branches and tags available for fetching from the remote repository
244 and exit immediately.
245 Cannot be used together with any of the other options except
250 Create the cloned repository as a mirror of the original repository.
251 This is useful if the cloned repository will not be used to store
252 locally created commits.
258 files will be set up with the
260 option enabled, such that
264 will write incoming changes directly to branches in the
266 reference namespace, rather than to branches in the
269 This avoids the usual requirement of having to run
273 in order to make incoming changes appear on branches in the
276 But maintaining custom changes in the cloned repository becomes difficult
277 since such changes will be at risk of being discarded whenever incoming
280 Suppress progress reporting output.
281 The same option will be passed to
284 .It Fl R Ar reference
285 In addition to the branches and tags that will be fetched, fetch an arbitrary
287 from the remote repository's
290 This option may be specified multiple times to build a list of additional
294 may either be a path to a specific reference, or a reference namespace
295 which will cause all references in this namespace to be fetched.
297 Each reference will be mapped into the cloned repository's
299 namespace, unless the
301 option is used to mirror references directly into the cloned repository's
306 will refuse to fetch references from the remote repository's
315 to print debugging messages to standard error output.
316 This option will be passed to
319 Multiple -v options increase the verbosity.
327 .Op Fl R Ar reference
328 .Op Fl r Ar repository-path
329 .Op Ar remote-repository
332 Fetch new changes from a remote repository.
334 .Ar remote-repository
338 The remote repository's URL is obtained from the corresponding entry in
342 file of the local repository, as created by
345 New changes will be stored in a separate pack file downloaded from the server.
346 Optionally, separate pack files stored in the repository can be combined with
349 By default, branch references in the
351 reference namespace will be updated to point at the newly fetched commits.
354 command can then be used to make new changes visible on branches in the
356 namespace, merging incoming changes with the changes on those branches
359 If the repository was created as a mirror with
361 then all branches in the
363 namespace will be updated directly to match the corresponding branches in
364 the remote repository.
365 If those branches contained local commits, these commits will no longer be
366 reachable via a reference and will therefore be at risk of being discarded
367 by Git's garbage collector or
368 .Cm gotadmin cleanup .
369 Maintaining custom changes in a mirror repository is therefore discouraged.
371 In any case, references in the
373 namespace will always be fetched and mapped directly to local references
374 in the same namespace.
381 Fetch all branches from the remote repository's
384 This option can be enabled by default for specific repositories in
386 If this option is not specified, a branch resolved via the remote
387 repository's HEAD reference will be fetched.
388 Cannot be used together with the
394 from the remote repository's
397 This option may be specified multiple times to build a list of branches
399 If this option is not specified, a branch resolved via the remote
400 repository's HEAD reference will be fetched.
401 Cannot be used together with the
405 Delete branches and tags from the local repository which are no longer
406 present in the remote repository.
407 Only references are deleted.
408 Any commit, tree, tag, and blob objects belonging to deleted branches or
409 tags remain in the repository and may be removed separately with
410 Git's garbage collector or
411 .Cm gotadmin cleanup .
413 List branches and tags available for fetching from the remote repository
414 and exit immediately.
415 Cannot be used together with any of the other options except
421 Suppress progress reporting output.
422 The same option will be passed to
425 .It Fl R Ar reference
426 In addition to the branches and tags that will be fetched, fetch an arbitrary
428 from the remote repository's
431 This option may be specified multiple times to build a list of additional
435 may either be a path to a specific reference, or a reference namespace
436 which will cause all references in this namespace to be fetched.
438 Each reference will be mapped into the local repository's
440 namespace, unless the local repository was created as a mirror with
442 in which case references will be mapped directly into the local repository's
446 Once a reference has been fetched, a branch based on it can be created with
451 will refuse to fetch references from the remote repository's
456 .It Fl r Ar repository-path
457 Use the repository at the specified path.
458 If not specified, assume the repository is located at or above the current
460 If this directory is a
462 work tree, use the repository path associated with this work tree.
464 Allow existing references in the
466 namespace to be updated if they have changed on the server.
467 If not specified, only new tag references will be created.
472 to print debugging messages to standard error output.
473 The same option will be passed to
476 Multiple -v options increase the verbosity.
479 Delete all references which correspond to a particular
480 .Ar remote-repository
481 instead of fetching new changes.
482 This can be useful when a remote repository is being removed from
488 .Ar remote-repository
489 argument is mandatory and no other options except
496 Only references are deleted.
497 Any commit, tree, tag, and blob objects fetched from a remote repository
498 will generally be stored in pack files and may be removed separately with
500 and Git's garbage collector.
508 .Op Fl p Ar path-prefix
510 .Op Ar work-tree-path
513 Copy files from a repository into a new work tree.
514 Show the status of each affected file, using the following status codes:
515 .Bl -column YXZ description
516 .It A Ta new file was added
517 .It E Ta file already exists in work tree's meta-data
522 is not specified, either use the last component of
523 .Ar repository path ,
526 was specified use the last component of
534 Check out files from a commit on the specified
536 If this option is not specified, a branch resolved via the repository's HEAD
537 reference will be used.
539 Check out files from the specified
541 on the selected branch.
542 The expected argument is a commit ID SHA1 hash or an existing reference
543 or tag name which will be resolved to a commit ID.
544 An abbreviated hash argument will be expanded to a full SHA1 hash
545 automatically, provided the abbreviation is unique.
546 If this option is not specified, the most recent commit on the selected
551 is not contained in the selected branch, a different branch which contains
552 this commit must be specified with the
555 If no such branch is known, a new branch must be created for this
561 Checking out work trees with an unknown branch is intentionally not supported.
563 Proceed with the checkout operation even if the directory at
566 Existing files will be left intact.
567 .It Fl p Ar path-prefix
568 Restrict the work tree to a subset of the repository's tree hierarchy.
569 Only files beneath the specified
573 Silence progress output.
584 Update an existing work tree to a different
586 Change existing files in the work tree as necessary to match file contents
588 Preserve any local changes in the work tree and merge them with the
591 Files which already contain merge conflicts will not be updated to avoid
592 further complications.
593 Such files will be updated when
595 is run again after merge conflicts have been resolved.
596 If the conflicting changes are no longer needed, affected files can be
603 Show the status of each affected file, using the following status codes:
604 .Bl -column YXZ description
605 .It U Ta file was updated and contained no local changes
606 .It G Ta file was updated and local changes were merged cleanly
607 .It C Ta file was updated and conflicts occurred during merge
608 .It D Ta file was deleted
609 .It A Ta new file was added
610 .It \(a~ Ta versioned file is obstructed by a non-regular file
611 .It ! Ta a missing versioned file was restored
612 .It # Ta file was not updated because it contains merge conflicts
613 .It ? Ta changes destined for an unversioned file were not merged
618 is specified, update the entire work tree.
619 Otherwise, restrict the update operation to files at or within the
621 Each path is required to exist in the update operation's target commit.
622 Files in the work tree outside specified paths will remain unchanged and
623 will retain their previously recorded base commit.
626 commands may refuse to run while the work tree contains files from
627 multiple base commits.
628 The base commit of such a work tree can be made consistent by running
630 across the entire work tree.
633 is incompatible with the
638 cannot update paths with staged changes.
639 If changes have been staged with
641 these changes must first be committed with
651 Switch the work tree's branch reference to the specified
653 before updating the work tree.
654 This option requires that all paths in the work tree are updated.
656 As usual, any local changes in the work tree will be preserved.
657 This can be useful when switching to a newly created branch in order
658 to commit existing local changes to this branch.
660 Any local changes must be dealt with separately in order to obtain a
661 work tree with pristine file contents corresponding exactly to the specified
663 Such changes could first be committed to a different branch with
665 or could be discarded with
668 Update the work tree to the specified
670 The expected argument is a commit ID SHA1 hash or an existing reference
671 or tag name which will be resolved to a commit ID.
672 An abbreviated hash argument will be expanded to a full SHA1 hash
673 automatically, provided the abbreviation is unique.
674 If this option is not specified, the most recent commit on the work tree's
677 Silence progress output.
683 .Op Fl S Ar status-codes
684 .Op Fl s Ar status-codes
688 Show the current modification status of files in a work tree,
689 using the following status codes:
690 .Bl -column YXZ description
691 .It M Ta modified file
692 .It A Ta file scheduled for addition in next commit
693 .It D Ta file scheduled for deletion in next commit
694 .It C Ta modified or added file which contains merge conflicts
695 .It ! Ta versioned file was expected on disk but is missing
696 .It \(a~ Ta versioned file is obstructed by a non-regular file
697 .It ? Ta unversioned item not tracked by
699 .It m Ta modified file modes (executable bit only)
700 .It N Ta non-existent
702 specified on the command line
707 is specified, show modifications in the entire work tree.
708 Otherwise, show modifications at or within the specified paths.
710 If changes have been staged with
712 staged changes are shown in the second output column, using the following
714 .Bl -column YXZ description
715 .It M Ta file modification is staged
716 .It A Ta file addition is staged
717 .It D Ta file deletion is staged
720 Changes created on top of staged changes are indicated in the first column:
721 .Bl -column YXZ description
722 .It MM Ta file was modified after earlier changes have been staged
723 .It MA Ta file was modified after having been staged for addition
731 Show unversioned files even if they match an ignore pattern.
732 .It Fl S Ar status-codes
733 Suppress the output of files with a modification status matching any of the
734 single-character status codes contained in the
737 Any combination of codes from the above list of possible status codes
739 For staged files, status codes displayed in either column will be matched.
740 Cannot be used together with the
743 .It Fl s Ar status-codes
744 Only show files with a modification status matching any of the
745 single-character status codes contained in the
748 Any combination of codes from the above list of possible status codes
750 For staged files, status codes displayed in either column will be matched.
751 Cannot be used together with the
756 For compatibility with
767 files in each traversed directory and will not display unversioned files
768 which match these patterns.
773 supports consecutive asterisks,
775 which will match an arbitrary amount of directories.
779 only supports a single ignore pattern per line.
783 does not support negated ignore patterns prefixed with
785 and gives no special significance to the location of path component separators,
794 .Op Fl r Ar repository-path
795 .Op Fl S Ar search-pattern
799 Display history of a repository.
802 is specified, show only commits which modified this path.
803 If invoked in a work tree, the
805 is interpreted relative to the current working directory,
806 and the work tree's path prefix is implicitly prepended.
807 Otherwise, the path is interpreted relative to the repository root.
814 Display individual commits which were merged into the current branch
818 shows the linear history of the current branch only.
820 Set the number of context lines shown in diffs with
822 By default, 3 lines of context are shown.
824 Start traversing history at the specified
826 The expected argument is a commit ID SHA1 hash or an existing reference
827 or tag name which will be resolved to a commit ID.
828 An abbreviated hash argument will be expanded to a full SHA1 hash
829 automatically, provided the abbreviation is unique.
830 If this option is not specified, default to the work tree's current branch
831 if invoked in a work tree, or to the repository's HEAD reference.
833 Display diffstat of changes introduced in each commit.
834 Cannot be used with the
838 Limit history traversal to a given number of commits.
839 If this option is not specified, a default limit value of zero is used,
840 which is treated as an unbounded limit.
842 .Ev GOT_LOG_DEFAULT_LIMIT
843 environment variable may be set to change this default value.
845 Display the list of file paths changed in each commit, using the following
847 .Bl -column YXZ description
848 .It M Ta modified file
849 .It D Ta file was deleted
850 .It A Ta new file was added
851 .It m Ta modified file modes (executable bit only)
854 Cannot be used with the
858 Display the patch of modifications made in each commit.
861 is specified, only show the patch of modifications at or within this path.
862 Cannot be used with the
866 Determine a set of commits to display as usual, but display these commits
868 .It Fl r Ar repository-path
869 Use the repository at the specified path.
870 If not specified, assume the repository is located at or above the current
872 If this directory is a
874 work tree, use the repository path associated with this work tree.
875 .It Fl S Ar search-pattern
876 If specified, show only commits with a log message, author name,
877 committer name, or ID SHA1 hash matched by the extended regular
880 Lines in committed patches will be matched if
883 File paths changed by a commit will be matched if
886 Regular expression syntax is documented in
889 Display a short one-line summary of each commit, instead of the default
891 Cannot be used together with the
897 Stop traversing commit history immediately after the specified
900 This option has no effect if the specified
910 .Op Fl r Ar repository-path
911 .Op Ar object1 Ar object2 | Ar path ...
914 When invoked within a work tree without any arguments, display all
915 local changes in the work tree.
918 arguments are specified, only show changes within the specified paths.
920 If two arguments are provided, treat each argument as a reference, a tag
921 name, or an object ID SHA1 hash, and display differences between the
922 corresponding objects.
923 Both objects must be of the same type (blobs, trees, or commits).
924 An abbreviated hash argument will be expanded to a full SHA1 hash
925 automatically, provided the abbreviation is unique.
926 If none of these interpretations produce a valid result or if the
931 is running in a work tree, attempt to interpret the two arguments as paths.
938 Treat file contents as ASCII text even if binary data is detected.
940 Set the number of context lines shown in the diff.
941 By default, 3 lines of context are shown.
943 Show differences between commits in the repository.
944 This option may be used up to two times.
945 When used only once, show differences between the specified
947 and its first parent commit.
948 When used twice, show differences between the two specified commits.
950 The expected argument is a commit ID SHA1 hash or an existing reference
951 or tag name which will be resolved to a commit ID.
952 An abbreviated hash argument will be expanded to a full SHA1 hash
953 automatically, provided the abbreviation is unique.
957 option is used, all non-option arguments will be interpreted as paths.
960 arguments are provided, only show differences for the specified paths.
962 Cannot be used together with the
966 Display diffstat of changes before the actual diff by annotating each file path
967 or blob hash being diffed with the total number of lines added and removed.
968 A summary line will display the total number of changes across all files.
970 Interpret all arguments as paths only.
971 This option can be used to resolve ambiguity in cases where paths
972 look like tag names, reference names, or object IDs.
973 This option is only valid when
975 is invoked in a work tree.
976 .It Fl r Ar repository-path
977 Use the repository at the specified path.
978 If not specified, assume the repository is located at or above the current
980 If this directory is a
982 work tree, use the repository path associated with this work tree.
984 Show changes staged with
986 instead of showing local changes in the work tree.
987 This option is only valid when
989 is invoked in a work tree.
991 Ignore whitespace-only changes.
997 .Op Fl r Ar repository-path
1001 Display line-by-line history of a file at the specified path.
1008 Start traversing history at the specified
1010 The expected argument is a commit ID SHA1 hash or an existing reference
1011 or tag name which will be resolved to a commit ID.
1012 An abbreviated hash argument will be expanded to a full SHA1 hash
1013 automatically, provided the abbreviation is unique.
1014 .It Fl r Ar repository-path
1015 Use the repository at the specified path.
1016 If not specified, assume the repository is located at or above the current
1018 If this directory is a
1020 work tree, use the repository path associated with this work tree.
1027 .Op Fl r Ar repository-path
1031 Display a listing of files and directories at the specified
1032 directory path in the repository.
1033 Entries shown in this listing may carry one of the following trailing
1035 .Bl -column YXZ description
1036 .It @ Ta entry is a symbolic link
1037 .It / Ta entry is a directory
1038 .It * Ta entry is an executable file
1039 .It $ Ta entry is a Git submodule
1042 Symbolic link entries are also annotated with the target path of the link.
1046 is specified, list the repository path corresponding to the current
1047 directory of the work tree, or the root directory of the repository
1048 if there is no work tree.
1055 List files and directories as they appear in the specified
1057 The expected argument is a commit ID SHA1 hash or an existing reference
1058 or tag name which will be resolved to a commit ID.
1059 An abbreviated hash argument will be expanded to a full SHA1 hash
1060 automatically, provided the abbreviation is unique.
1062 Show object IDs of files (blob objects) and directories (tree objects).
1064 Recurse into sub-directories in the repository.
1065 .It Fl r Ar repository-path
1066 Use the repository at the specified path.
1067 If not specified, assume the repository is located at or above the current
1069 If this directory is a
1071 work tree, use the repository path associated with this work tree.
1077 .Op Fl r Ar repository-path
1078 .Op Fl s Ar reference
1081 Manage references in a repository.
1083 References may be listed, created, deleted, and changed.
1084 When creating, deleting, or changing a reference the specified
1086 must be an absolute reference name, i.e. it must begin with
1094 Create a reference or change an existing reference.
1095 The reference with the specified
1097 will point at the specified
1101 argument is a ID SHA1 hash or an existing reference or tag name which will
1102 be resolved to the ID of a corresponding commit, tree, tag, or blob object.
1103 Cannot be used together with any other options except
1106 Delete the reference with the specified
1108 from the repository.
1109 Any commit, tree, tag, and blob objects belonging to deleted references
1110 remain in the repository and may be removed separately with
1111 Git's garbage collector or
1112 .Cm gotadmin cleanup .
1113 Cannot be used together with any other options except
1116 List references in the repository.
1119 is specified, list all existing references in the repository.
1122 is a reference namespace, list all references in this namespace.
1123 Otherwise, show only the reference with the given
1125 Cannot be used together with any other options except
1129 .It Fl r Ar repository-path
1130 Use the repository at the specified path.
1131 If not specified, assume the repository is located at or above the current
1133 If this directory is a
1135 work tree, use the repository path associated with this work tree.
1136 .It Fl s Ar reference
1137 Create a symbolic reference, or change an existing symbolic reference.
1138 The symbolic reference with the specified
1140 will point at the specified
1142 which must already exist in the repository.
1143 Care should be taken not to create loops between references when
1144 this option is used.
1145 Cannot be used together with any other options except
1148 Sort listed references by modification time (most recently modified first)
1149 instead of sorting by lexicographical order.
1150 Use of this option requires the
1152 option to be used as well.
1160 .Op Fl r Ar repository-path
1164 Create, list, or delete branches.
1166 Local branches are managed via references which live in the
1168 reference namespace.
1171 command creates references in this namespace only.
1173 When deleting branches, the specified
1177 reference namespace first.
1178 If no corresponding branch is found, the
1180 namespace will be searched next.
1182 If invoked in a work tree without any arguments, print the name of the
1183 work tree's current branch.
1187 argument is passed, attempt to create a branch reference with the given name.
1188 By default the new branch reference will point at the latest commit on the
1189 work tree's current branch if invoked in a work tree, and otherwise to a commit
1190 resolved via the repository's HEAD reference.
1192 If invoked in a work tree, once the branch was created successfully
1193 switch the work tree's head reference to the newly created branch and
1194 update files across the entire work tree, just like
1195 .Cm got update -b Ar name
1197 Show the status of each affected file, using the following status codes:
1198 .Bl -column YXZ description
1199 .It U Ta file was updated and contained no local changes
1200 .It G Ta file was updated and local changes were merged cleanly
1201 .It C Ta file was updated and conflicts occurred during merge
1202 .It D Ta file was deleted
1203 .It A Ta new file was added
1204 .It \(a~ Ta versioned file is obstructed by a non-regular file
1205 .It ! Ta a missing versioned file was restored
1213 Make a newly created branch reference point at the specified
1217 argument is a commit ID SHA1 hash or an existing reference
1218 or tag name which will be resolved to a commit ID.
1220 Delete the branch with the specified
1226 reference namespace.
1228 Only the branch reference is deleted.
1229 Any commit, tree, and blob objects belonging to the branch
1230 remain in the repository and may be removed separately with
1231 Git's garbage collector or
1232 .Cm gotadmin cleanup .
1234 List all existing branches in the repository, including copies of remote
1235 repositories' branches in the
1237 reference namespace.
1239 If invoked in a work tree, the work tree's current branch is shown
1240 with one the following annotations:
1241 .Bl -column YXZ description
1242 .It * Ta work tree's base commit matches the branch tip
1243 .It \(a~ Ta work tree's base commit is out-of-date
1246 Do not switch and update the work tree after creating a new branch.
1247 .It Fl r Ar repository-path
1248 Use the repository at the specified path.
1249 If not specified, assume the repository is located at or above the current
1251 If this directory is a
1253 work tree, use the repository path associated with this work tree.
1255 Sort listed branches by modification time (most recently modified first)
1256 instead of sorting by lexicographical order.
1259 reference namespace are listed before branches in
1262 Use of this option requires the
1264 option to be used as well.
1271 .Op Fl r Ar repository-path
1272 .Op Fl s Ar signer-id
1275 Manage tags in a repository.
1277 Tags are managed via references which live in the
1279 reference namespace.
1282 command operates on references in this namespace only.
1283 References in this namespace point at tag objects which contain a pointer
1284 to another object, a tag message, as well as author and timestamp information.
1286 Attempt to create a tag with the given
1288 and make this tag point at the given
1290 If no commit is specified, default to the latest commit on the work tree's
1291 current branch if invoked in a work tree, and to a commit resolved via
1292 the repository's HEAD reference otherwise.
1299 Make the newly created tag reference point at the specified
1303 argument is a commit ID SHA1 hash or an existing reference or tag name which
1304 will be resolved to a commit ID.
1305 An abbreviated hash argument will be expanded to a full SHA1 hash
1306 automatically, provided the abbreviation is unique.
1308 List all existing tags in the repository instead of creating a new tag.
1311 argument is passed, show only the tag with the given
1314 Use the specified tag message when creating the new tag.
1319 opens a temporary file in an editor where a tag message can be written.
1320 .It Fl r Ar repository-path
1321 Use the repository at the specified path.
1322 If not specified, assume the repository is located at or above the current
1324 If this directory is a
1326 work tree, use the repository path associated with this work tree.
1327 .It Fl s Ar signer-id
1328 While creating a new tag, sign this tag with the identity given in
1331 For SSH-based signatures,
1333 is the path to a file which may refer to either a private SSH key,
1334 or a public SSH key with the private half available via
1337 will sign the tag object by invoking
1341 command, using the signature namespace
1343 for compatibility with
1346 Verify tag object signatures.
1349 is specified, show and verify the tag object with the provided name.
1350 Otherwise, list all tag objects and verify signatures where present.
1353 verifies SSH-based signatures by invoking
1356 .Fl Y Cm verify Fl f Ar allowed_signers .
1361 otherwise verification is impossible.
1364 During SSH signature creation and verification this option will be passed to
1366 Multiple -v options increase the verbosity.
1372 command will not delete tags or change existing tags.
1373 If a tag must be deleted, the
1375 command may be used to delete a tag's reference.
1376 This should only be done if the tag has not already been copied to
1383 Schedule unversioned files in a work tree for addition to the
1384 repository in the next commit.
1385 By default, files which match a
1387 ignore pattern will not be added.
1394 Add files even if they match a
1398 Permit recursion into directories.
1399 If this option is not specified,
1401 will refuse to run if a specified
1409 .Op Fl s Ar status-codes
1413 Remove versioned files from a work tree and schedule them for deletion
1414 from the repository in the next commit.
1421 Perform the operation even if a file contains local modifications,
1422 and do not raise an error if a specified
1424 does not exist on disk.
1426 Keep affected files on disk.
1428 Permit recursion into directories.
1429 If this option is not specified,
1431 will refuse to run if a specified
1434 .It Fl s Ar status-codes
1435 Only delete files with a modification status matching one of the
1436 single-character status codes contained in the
1439 The following status codes may be specified:
1440 .Bl -column YXZ description
1441 .It M Ta modified file (this implies the
1444 .It ! Ta versioned file expected on disk but missing
1452 .Op Fl p Ar strip-count
1458 to files in a work tree.
1459 Files added or removed by a patch will be scheduled for addition or removal in
1462 The patch must be in the unified diff format as produced by
1469 diff when invoked with their
1474 argument is provided, read unified diff data from standard input instead.
1478 contains multiple patches, then attempt to apply each of them in sequence.
1480 Show the status of each affected file, using the following status codes:
1481 .Bl -column XYZ description
1482 .It M Ta file was modified
1483 .It G Ta file was merged using a merge-base found in the repository
1484 .It C Ta file was merged and conflicts occurred during merge
1485 .It D Ta file was deleted
1486 .It A Ta file was added
1487 .It # Ta failed to patch the file
1490 If a change does not match at its exact line number, attempt to
1491 apply it somewhere else in the file if a good spot can be found.
1492 Otherwise, the patch will fail to apply.
1496 will refuse to apply a patch if certain preconditions are not met.
1497 Files to be deleted must already be under version control, and must
1498 not have been scheduled for deletion already.
1499 Files to be added must not yet be under version control and must not
1500 already be present on disk.
1501 Files to be modified must already be under version control and may not
1502 contain conflict markers.
1504 If an error occurs, the
1506 operation will be aborted.
1507 Any changes made to the work tree up to this point will be left behind.
1508 Such changes can be viewed with
1510 and can be reverted with
1519 Attempt to locate files within the specified
1521 for use as a merge-base for 3-way merges.
1522 Ideally, the specified
1524 should contain versions of files which the changes contained in the
1527 Files will be located by path, relative to the repository root.
1530 option is used then leading path components will be stripped
1531 before paths are looked up in the repository.
1535 option is not used then
1537 will attempt to locate merge-bases via object IDs found in
1539 meta-data, such as produced by
1545 option is only recommended in the absence of such meta-data.
1547 In case no merge-base is available for a file, changes will be applied
1548 without doing a 3-way merge.
1549 Changes which do not apply cleanly may then be rejected entirely, rather
1550 than producing merge conflicts in the patched target file.
1552 Do not make any modifications to the work tree.
1553 This can be used to check whether a patch would apply without issues.
1556 contains diffs that affect the same file multiple times, the results
1557 displayed may be incorrect.
1558 .It Fl p Ar strip-count
1559 Specify the number of leading path components to strip from paths
1568 path prefixes generated by
1570 will be recognized and stripped automatically.
1572 Reverse the patch before applying it.
1578 .Op Fl F Ar response-script
1582 Revert any local changes in files at the specified paths in a work tree.
1583 File contents will be overwritten with those contained in the
1584 work tree's base commit.
1585 There is no way to bring discarded changes back after
1588 If a file was added with
1590 it will become an unversioned file again.
1591 If a file was deleted with
1593 it will be restored.
1599 .It Fl F Ar response-script
1607 responses line-by-line from the specified
1609 file instead of prompting interactively.
1611 Instead of reverting all changes in files, interactively select or reject
1612 changes to revert based on
1618 (quit reverting this file) responses.
1619 If a file is in modified status, individual patches derived from the
1620 modified file content can be reverted.
1621 Files in added or deleted status may only be reverted in their entirety.
1623 Permit recursion into directories.
1624 If this option is not specified,
1626 will refuse to run if a specified
1640 Create a new commit in the repository from changes in a work tree
1641 and use this commit as the new base commit for the work tree.
1644 is specified, commit all changes in the work tree.
1645 Otherwise, commit changes at or within the specified paths.
1647 If changes have been explicitly staged for commit with
1649 only commit staged changes and reject any specified paths which
1650 have not been staged.
1653 opens a temporary file in an editor where a log message can be written
1661 options are used together.
1663 Show the status of each affected file, using the following status codes:
1664 .Bl -column YXZ description
1665 .It M Ta modified file
1666 .It D Ta file was deleted
1667 .It A Ta new file was added
1668 .It m Ta modified file modes (executable bit only)
1671 Files which are not part of the new commit will retain their previously
1672 recorded base commit.
1675 commands may refuse to run while the work tree contains files from
1676 multiple base commits.
1677 The base commit of such a work tree can be made consistent by running
1679 across the entire work tree.
1683 command requires the
1685 environment variable to be set,
1686 unless an author has been configured in
1692 configuration settings can be
1693 obtained from the repository's
1695 file or from Git's global
1704 Set author information in the newly created commit to
1706 This is useful when committing changes which were written by someone
1710 argument must use the same format as the
1712 environment variable.
1714 In addition to storing author information, the newly created commit
1717 information which is obtained, as usual, from the
1719 environment variable, or
1721 or Git configuration settings.
1723 Use the prepared log message stored in the file found at
1725 when creating the new commit.
1727 opens a temporary file in an editor where the prepared log message can be
1728 reviewed and edited further if needed.
1729 Cannot be used together with the
1733 Use the specified log message when creating the new commit.
1734 Cannot be used together with the
1738 This option prevents
1740 from opening the commit message in an editor.
1741 It has no effect unless it is used together with the
1743 option and is intended for non-interactive use such as scripting.
1745 This option prevents
1747 from generating a diff of the to-be-committed changes in a temporary file
1748 which can be viewed while editing a commit message.
1750 Allow the addition of symbolic links which point outside of the path space
1751 that is under version control.
1754 will reject such symbolic links due to safety concerns.
1757 may decide to represent such a symbolic link as a regular file which contains
1758 the link's target path, rather than creating an actual symbolic link which
1759 points outside of the work tree.
1760 Use of this option is discouraged because external mechanisms such as
1762 are better suited for managing symbolic links to paths not under
1767 will refuse to run if certain preconditions are not met.
1768 If the work tree's current branch is not in the
1770 reference namespace, new commits may not be created on this branch.
1771 Local changes may only be committed if they are based on file content
1772 found in the most recent commit on the work tree's branch.
1773 If a path is found to be out of date,
1775 must be used first in order to merge local changes with changes made
1783 .Op Fl r Ar repository-path
1785 .Op Ar remote-repository
1788 Send new changes to a remote repository.
1790 .Ar remote-repository
1794 The remote repository's URL is obtained from the corresponding entry in
1798 file of the local repository, as created by
1801 All objects corresponding to new changes will be written to a temporary
1802 pack file which is then uploaded to the server.
1803 Upon success, references in the
1805 reference namespace of the local repository will be updated to point at
1806 the commits which have been sent.
1808 By default, changes will only be sent if they are based on up-to-date
1809 copies of relevant branches in the remote repository.
1810 If any changes to be sent are based on out-of-date copies or would
1811 otherwise break linear history of existing branches, new changes must
1812 be fetched from the server with
1814 and local branches must be rebased with
1821 option can be used to make exceptions to these requirements.
1828 Send all branches from the local repository's
1830 reference namespace.
1833 option is equivalent to listing all branches with multiple
1836 Cannot be used together with the
1842 from the local repository's
1844 reference namespace.
1845 This option may be specified multiple times to build a list of branches
1847 If this option is not specified, default to the work tree's current branch
1848 if invoked in a work tree, or to the repository's HEAD reference.
1849 Cannot be used together with the
1853 Delete the specified
1855 from the remote repository's
1857 reference namespace.
1858 This option may be specified multiple times to build a list of branches
1861 Only references are deleted.
1862 Any commit, tree, tag, and blob objects belonging to deleted branches
1863 may become subject to deletion by Git's garbage collector running on
1866 Requesting deletion of branches results in an error if the server
1867 does not support this feature or disallows the deletion of branches
1868 based on its configuration.
1870 Attempt to force the server to overwrite existing branches or tags
1871 in the remote repository, even when
1875 would usually be required before changes can be sent.
1876 The server may reject forced requests regardless, depending on its
1879 Any commit, tree, tag, and blob objects belonging to overwritten branches
1880 or tags may become subject to deletion by Git's garbage collector running
1885 reference namespace is globally shared between all repositories.
1888 option to overwrite tags is discouraged because it can lead to
1889 inconsistencies between the tags present in different repositories.
1890 In general, creating a new tag with a different name is recommended
1891 instead of overwriting an existing tag.
1895 option is particularly discouraged if changes being sent are based
1896 on an out-of-date copy of a branch in the remote repository.
1897 Instead of using the
1899 option, new changes should
1902 and local branches should be rebased with
1904 followed by another attempt to send the changes.
1908 option should only be needed in situations where the remote repository's
1909 copy of a branch or tag is known to be out-of-date and is considered
1911 The risks of creating inconsistencies between different repositories
1912 should also be taken into account.
1914 Suppress progress reporting output.
1915 The same option will be passed to
1918 .It Fl r Ar repository-path
1919 Use the repository at the specified path.
1920 If not specified, assume the repository is located at or above the current
1922 If this directory is a
1924 work tree, use the repository path associated with this work tree.
1926 Attempt to send all tags from the local repository's
1928 reference namespace.
1931 option is equivalent to listing all tags with multiple
1934 Cannot be used together with the
1940 from the local repository's
1942 reference namespace, in addition to any branches that are being sent.
1945 option may be specified multiple times to build a list of tags to send.
1946 No tags will be sent if the
1950 Raise an error if the specified
1952 already exists in the remote repository, unless the
1954 option is used to overwrite the server's copy of the tag.
1955 In general, creating a new tag with a different name is recommended
1956 instead of overwriting an existing tag.
1958 Cannot be used together with the
1965 to print debugging messages to standard error output.
1966 The same option will be passed to
1969 Multiple -v options increase the verbosity.
1979 Merge changes from a single
1984 should be on a different branch than the work tree's base commit.
1985 The expected argument is a reference or a commit ID SHA1 hash.
1986 An abbreviated hash argument will be expanded to a full SHA1 hash
1987 automatically, provided the abbreviation is unique.
1989 Show the status of each affected file, using the following status codes:
1990 .Bl -column YXZ description
1991 .It G Ta file was merged
1992 .It C Ta file was merged and conflicts occurred during merge
1993 .It ! Ta changes destined for a missing file were not merged
1994 .It D Ta file was deleted
1995 .It d Ta file's deletion was prevented by local modifications
1996 .It A Ta new file was added
1997 .It \(a~ Ta changes destined for a non-regular file were not merged
1998 .It ? Ta changes destined for an unversioned file were not merged
2001 The merged changes will appear as local changes in the work tree, which
2004 amended manually or with further
2010 If invoked in a work tree where no
2015 operation is taking place,
2017 creates a record of commits which have been merged into the work tree.
2018 When a file changed by
2022 the log messages of relevant merged commits will then appear in the editor,
2023 where the messages can be further adjusted as needed.
2024 If all the changes in all files touched by a given commit are discarded,
2027 this commit's log message record will also disappear.
2030 will refuse to run if certain preconditions are not met.
2031 If the work tree contains multiple base commits, it must first be updated
2032 to a single base commit with
2034 If any relevant files already contain merge conflicts, these
2035 conflicts must be resolved first.
2043 Display a list of commit log messages recorded by cherrypick operations,
2044 represented by references in the
2045 .Dq refs/got/worktree
2046 reference namespace.
2049 is specified, only show the log message of the specified commit.
2051 If invoked in a work tree, only log messages recorded by cherrypick operations
2052 in the current work tree will be displayed.
2053 Otherwise, all commit log messages will be displayed irrespective of the
2054 work tree in which they were created.
2055 This option cannot be used with
2058 Delete log messages created by previous cherrypick operations, represented by
2060 .Dq refs/got/worktree
2061 reference namespace.
2064 is specified, only delete the log message of the specified commit.
2066 If invoked in a work tree, only log messages recorded by cherrypick operations
2067 in the current work tree will be deleted.
2068 Otherwise, all commit log messages will be deleted irrespective of the
2069 work tree in which they were created.
2070 This option cannot be used with
2081 Reverse-merge changes from a single
2086 should be on the same branch as the work tree's base commit.
2087 The expected argument is a reference or a commit ID SHA1 hash.
2088 An abbreviated hash argument will be expanded to a full SHA1 hash
2089 automatically, provided the abbreviation is unique.
2091 Show the status of each affected file, using the following status codes:
2092 .Bl -column YXZ description
2093 .It G Ta file was merged
2094 .It C Ta file was merged and conflicts occurred during merge
2095 .It ! Ta changes destined for a missing file were not merged
2096 .It D Ta file was deleted
2097 .It d Ta file's deletion was prevented by local modifications
2098 .It A Ta new file was added
2099 .It \(a~ Ta changes destined for a non-regular file were not merged
2100 .It ? Ta changes destined for an unversioned file were not merged
2103 The reverse-merged changes will appear as local changes in the work tree,
2104 which may be viewed with
2106 amended manually or with further
2112 If invoked in a work tree where no
2117 operation is taking place,
2119 creates a record of commits which have been reverse-merged into the work tree.
2120 When a file changed by
2124 the log messages of relevant reverse-merged commits will then appear in
2125 the editor, where the messages can be further adjusted as needed.
2126 If all the changes in all files touched by a given commit are discarded,
2129 this commit's log message record will also disappear.
2132 will refuse to run if certain preconditions are not met.
2133 If the work tree contains multiple base commits, it must first be updated
2134 to a single base commit with
2136 If any relevant files already contain merge conflicts, these
2137 conflicts must be resolved first.
2145 Display a list of commit log messages recorded by backout operations,
2146 represented by references in the
2147 .Dq refs/got/worktree
2148 reference namespace.
2151 is specified, only show the log message of the specified commit.
2153 If invoked in a work tree, only log messages recorded by backout operations
2154 in the current work tree will be displayed.
2155 Otherwise, all commit log messages will be displayed irrespective of the
2156 work tree in which they were created.
2157 This option cannot be used with
2160 Delete log messages created by previous backout operations, represented by
2162 .Dq refs/got/worktree
2163 reference namespace.
2166 is specified, only delete the log message of the specified commit.
2168 If invoked in a work tree, only log messages recorded by backout operations
2169 in the current work tree will be deleted.
2170 Otherwise, all commit log messages will be deleted irrespective of the
2171 work tree in which they were created.
2172 This option cannot be used with
2183 Rebase commits on the specified
2185 onto the tip of the current branch of the work tree.
2188 must share common ancestry with the work tree's current branch.
2189 Rebasing begins with the first descendant commit of the youngest
2190 common ancestor commit shared by the specified
2192 and the work tree's current branch, and stops once the tip commit
2199 is used as intended, the specified
2201 represents a local commit history and may already contain changes
2202 that are not yet visible in any other repositories.
2203 The work tree's current branch, which must be set with
2207 operation, represents a branch from a remote repository which shares
2208 a common history with the specified
2210 but has progressed, and perhaps diverged, due to commits added to the
2213 Rebased commits are accumulated on a temporary branch which the work tree
2214 will remain switched to throughout the entire rebase operation.
2215 Commits on this branch represent the same changes with the same log
2216 messages as their counterparts on the original
2218 but with different commit IDs.
2219 Once rebasing has completed successfully, the temporary branch becomes
2220 the new version of the specified
2222 and the work tree is automatically switched to it.
2223 If author information is available via the
2225 environment variable,
2231 configuration settings, this author information will be used to identify
2236 Old commits in their pre-rebase state are automatically backed up in the
2237 .Dq refs/got/backup/rebase
2238 reference namespace.
2239 As long as these references are not removed older versions of rebased
2240 commits will remain in the repository and can be viewed with the
2243 Removal of these references makes objects which become unreachable via
2244 any reference subject to removal by Git's garbage collector or
2245 .Cm gotadmin cleanup .
2247 While rebasing commits, show the status of each affected file,
2248 using the following status codes:
2249 .Bl -column YXZ description
2250 .It G Ta file was merged
2251 .It C Ta file was merged and conflicts occurred during merge
2252 .It ! Ta changes destined for a missing file were not merged
2253 .It D Ta file was deleted
2254 .It d Ta file's deletion was prevented by local modifications
2255 .It A Ta new file was added
2256 .It \(a~ Ta changes destined for a non-regular file were not merged
2257 .It ? Ta changes destined for an unversioned file were not merged
2260 If merge conflicts occur, the rebase operation is interrupted and may
2261 be continued once conflicts have been resolved.
2262 If any files with destined changes are found to be missing or unversioned,
2263 or if files could not be deleted due to differences in deleted content,
2264 the rebase operation will be interrupted to prevent potentially incomplete
2265 changes from being committed to the repository without user intervention.
2266 The work tree may be modified as desired and the rebase operation can be
2267 continued once the changes present in the work tree are considered complete.
2268 Alternatively, the rebase operation may be aborted which will leave
2270 unmodified and the work tree switched back to its original branch.
2272 If a merge conflict is resolved in a way which renders the merged
2273 change into a no-op change, the corresponding commit will be elided
2274 when the rebase operation continues.
2277 will refuse to run if certain preconditions are not met.
2282 reference namespace, the branch may not be rebased.
2283 If the work tree is not yet fully updated to the tip commit of its
2284 branch, then the work tree must first be updated with
2286 If changes have been staged with
2288 these changes must first be committed with
2292 If the work tree contains local changes, these changes must first be
2299 contains changes to files outside of the work tree's path prefix,
2300 the work tree cannot be used to rebase this branch.
2309 commands will refuse to run while a rebase operation is in progress.
2310 Other commands which manipulate the work tree may be used for
2311 conflict resolution purposes.
2315 is already based on the work tree's current branch, then no commits
2316 need to be rebased and
2318 will simply switch the work tree to the specified
2320 and update files in the work tree accordingly.
2327 Abort an interrupted rebase operation.
2328 If this option is used, no other command-line arguments are allowed.
2330 Continue an interrupted rebase operation.
2331 If this option is used, no other command-line arguments are allowed.
2333 Show a list of past rebase operations, represented by references in the
2334 .Dq refs/got/backup/rebase
2335 reference namespace.
2337 Display the author, date, and log message of each backed up commit,
2338 the object ID of the corresponding post-rebase commit, and
2339 the object ID of their common ancestor commit.
2340 Given these object IDs,
2347 options can be used to examine the history of either version of the branch,
2352 option can be used to create a new branch from a pre-rebase state if desired.
2356 is specified, only show commits which at some point in time represented this
2358 Otherwise, list all backed up commits for any branches.
2360 If this option is used,
2362 does not require a work tree.
2363 None of the other options can be used together with
2366 Delete backups created by past rebase operations, represented by references
2368 .Dq refs/got/backup/rebase
2369 reference namespace.
2373 is specified, only delete backups which at some point in time represented
2375 Otherwise, delete all references found within
2376 .Dq refs/got/backup/rebase .
2378 Any commit, tree, tag, and blob objects belonging to deleted backups
2379 remain in the repository and may be removed separately with
2380 Git's garbage collector or
2381 .Cm gotadmin cleanup .
2383 If this option is used,
2385 does not require a work tree.
2386 None of the other options can be used together with
2393 .Op Fl F Ar histedit-script
2397 Edit commit history between the work tree's current base commit and
2398 the tip commit of the work tree's current branch.
2402 command requires the
2404 environment variable to be set,
2405 unless an author has been configured in
2411 configuration settings can be obtained from the repository's
2413 file or from Git's global
2419 operation, the work tree's current branch must be set with
2421 to the branch which should be edited, unless this branch is already the
2422 current branch of the work tree.
2423 The tip of this branch represents the upper bound (inclusive) of commits
2428 Furthermore, the work tree's base commit
2431 to a point in this branch's commit history where editing should begin.
2432 This commit represents the lower bound (non-inclusive) of commits touched
2437 Editing of commit history is controlled via a
2439 which can be written in an editor based on a template, passed on the
2440 command line, or generated with the
2446 The format of the histedit script is line-based.
2447 Each line in the script begins with a command name, followed by
2448 whitespace and an argument.
2449 For most commands, the expected argument is a commit ID SHA1 hash.
2450 Any remaining text on the line is ignored.
2451 Lines which begin with the
2453 character are ignored entirely.
2455 The available histedit script commands are as follows:
2456 .Bl -column YXZ pick-commit
2457 .It Cm pick Ar commit Ta Use the specified commit as it is.
2458 .It Cm edit Ar commit Ta Use the specified commit but once changes have been
2459 merged into the work tree interrupt the histedit operation for amending.
2460 .It Cm fold Ar commit Ta Combine the specified commit with the next commit
2461 listed further below that will be used.
2462 .It Cm drop Ar commit Ta Remove this commit from the edited history.
2463 .It Cm mesg Oo Ar log-message Oc Ta Create a new log message for the commit of
2468 command on the previous line of the histedit script.
2471 argument provides a new single-line log message to use.
2474 argument is omitted, open an editor where a new log message can be written.
2477 Every commit in the history being edited must be mentioned in the script.
2478 Lines may be re-ordered to change the order of commits in the edited history.
2479 No commit may be listed more than once.
2481 Edited commits are accumulated on a temporary branch which the work tree
2482 will remain switched to throughout the entire histedit operation.
2483 Once history editing has completed successfully, the temporary branch becomes
2484 the new version of the work tree's branch and the work tree is automatically
2487 Old commits in their pre-histedit state are automatically backed up in the
2488 .Dq refs/got/backup/histedit
2489 reference namespace.
2490 As long as these references are not removed older versions of edited
2491 commits will remain in the repository and can be viewed with the
2494 Removal of these references makes objects which become unreachable via
2495 any reference subject to removal by Git's garbage collector or
2496 .Cm gotadmin cleanup .
2498 While merging commits, show the status of each affected file,
2499 using the following status codes:
2500 .Bl -column YXZ description
2501 .It G Ta file was merged
2502 .It C Ta file was merged and conflicts occurred during merge
2503 .It ! Ta changes destined for a missing file were not merged
2504 .It D Ta file was deleted
2505 .It d Ta file's deletion was prevented by local modifications
2506 .It A Ta new file was added
2507 .It \(a~ Ta changes destined for a non-regular file were not merged
2508 .It ? Ta changes destined for an unversioned file were not merged
2511 If merge conflicts occur, the histedit operation is interrupted and may
2512 be continued once conflicts have been resolved.
2513 If any files with destined changes are found to be missing or unversioned,
2514 or if files could not be deleted due to differences in deleted content,
2515 the histedit operation will be interrupted to prevent potentially incomplete
2516 changes from being committed to the repository without user intervention.
2517 The work tree may be modified as desired and the histedit operation can be
2518 continued once the changes present in the work tree are considered complete.
2519 Alternatively, the histedit operation may be aborted which will leave
2520 the work tree switched back to its original branch.
2522 If a merge conflict is resolved in a way which renders the merged
2523 change into a no-op change, the corresponding commit will be elided
2524 when the histedit operation continues.
2527 will refuse to run if certain preconditions are not met.
2528 If the work tree's current branch is not in the
2530 reference namespace, the history of the branch may not be edited.
2531 If the work tree contains multiple base commits, it must first be updated
2532 to a single base commit with
2534 If changes have been staged with
2536 these changes must first be committed with
2540 If the work tree contains local changes, these changes must first be
2545 If the edited history contains changes to files outside of the work tree's
2546 path prefix, the work tree cannot be used to edit the history of this branch.
2554 commands will refuse to run while a histedit operation is in progress.
2555 Other commands which manipulate the work tree may be used, and the
2557 command may be used to commit arbitrary changes to the temporary branch
2558 while the histedit operation is interrupted.
2565 Abort an interrupted histedit operation.
2566 If this option is used, no other command-line arguments are allowed.
2568 Continue an interrupted histedit operation.
2569 If this option is used, no other command-line arguments are allowed.
2571 Interrupt the histedit operation for editing after merging each commit.
2572 This option is a quick equivalent to a histedit script which uses the
2574 command for all commits.
2577 option can only be used when starting a new histedit operation.
2578 If this option is used, no other command-line arguments are allowed.
2579 .It Fl F Ar histedit-script
2582 instead of opening a temporary file in an editor where a histedit script
2585 Fold all commits into a single commit.
2586 This option is a quick equivalent to a histedit script which folds all
2587 commits, combining them all into one commit.
2590 option can only be used when starting a new histedit operation.
2591 If this option is used, no other command-line arguments are allowed.
2593 Show a list of past histedit operations, represented by references in the
2594 .Dq refs/got/backup/histedit
2595 reference namespace.
2597 Display the author, date, and log message of each backed up commit,
2598 the object ID of the corresponding post-histedit commit, and
2599 the object ID of their common ancestor commit.
2600 Given these object IDs,
2607 options can be used to examine the history of either version of the branch,
2612 option can be used to create a new branch from a pre-histedit state if desired.
2616 is specified, only show commits which at some point in time represented this
2618 Otherwise, list all backed up commits for any branches.
2620 If this option is used,
2622 does not require a work tree.
2623 None of the other options can be used together with
2626 Edit log messages only.
2627 This option is a quick equivalent to a histedit script which edits
2628 only log messages but otherwise leaves every picked commit as-is.
2631 option can only be used when starting a new histedit operation.
2632 If this option is used, no other command-line arguments are allowed.
2634 Delete backups created by past histedit operations, represented by references
2636 .Dq refs/got/backup/histedit
2637 reference namespace.
2641 is specified, only delete backups which at some point in time represented
2643 Otherwise, delete all references found within
2644 .Dq refs/got/backup/histedit .
2646 Any commit, tree, tag, and blob objects belonging to deleted backups
2647 remain in the repository and may be removed separately with
2648 Git's garbage collector or
2649 .Cm gotadmin cleanup .
2651 If this option is used,
2653 does not require a work tree.
2654 None of the other options can be used together with
2658 .It Cm integrate Ar branch
2660 Integrate the specified
2662 into the work tree's current branch.
2663 Files in the work tree are updated to match the contents on the integrated
2665 and the reference of the work tree's branch is changed to point at the
2666 head commit of the integrated
2669 Both branches can be considered equivalent after integration since they
2670 will be pointing at the same commit.
2671 Both branches remain available for future work, if desired.
2672 In case the integrated
2674 is no longer needed it may be deleted with
2677 Show the status of each affected file, using the following status codes:
2678 .Bl -column YXZ description
2679 .It U Ta file was updated
2680 .It D Ta file was deleted
2681 .It A Ta new file was added
2682 .It \(a~ Ta versioned file is obstructed by a non-regular file
2683 .It ! Ta a missing versioned file was restored
2687 will refuse to run if certain preconditions are not met.
2688 Most importantly, the
2690 must have been rebased onto the work tree's current branch with
2692 before it can be integrated, in order to linearize commit history and
2693 resolve merge conflicts.
2694 If the work tree contains multiple base commits, it must first be updated
2695 to a single base commit with
2697 If changes have been staged with
2699 these changes must first be committed with
2703 If the work tree contains local changes, these changes must first be
2715 Create a merge commit based on the current branch of the work tree and
2718 If a linear project history is desired, then use of
2720 should be preferred over
2722 However, even strictly linear projects may require merge commits in order
2723 to merge in new versions of third-party code stored on vendor branches
2727 Merge commits are commits based on multiple parent commits.
2728 The tip commit of the work tree's current branch, which must be set with
2732 operation, will be used as the first parent.
2733 The tip commit of the specified
2735 will be used as the second parent.
2737 No ancestral relationship between the two branches is required.
2738 If the two branches have already been merged previously, only new changes
2741 It is not possible to create merge commits with more than two parents.
2742 If more than one branch needs to be merged, then multiple merge commits
2743 with two parents each can be created in sequence.
2745 While merging changes found on the
2747 into the work tree, show the status of each affected file,
2748 using the following status codes:
2749 .Bl -column YXZ description
2750 .It G Ta file was merged
2751 .It C Ta file was merged and conflicts occurred during merge
2752 .It ! Ta changes destined for a missing file were not merged
2753 .It D Ta file was deleted
2754 .It d Ta file's deletion was prevented by local modifications
2755 .It A Ta new file was added
2756 .It \(a~ Ta changes destined for a non-regular file were not merged
2757 .It ? Ta changes destined for an unversioned file were not merged
2760 If merge conflicts occur, the merge operation is interrupted and conflicts
2761 must be resolved before the merge operation can continue.
2762 If any files with destined changes are found to be missing or unversioned,
2763 or if files could not be deleted due to differences in deleted content,
2764 the merge operation will be interrupted to prevent potentially incomplete
2765 changes from being committed to the repository without user intervention.
2766 The work tree may be modified as desired and the merge can be continued
2767 once the changes present in the work tree are considered complete.
2768 Alternatively, the merge operation may be aborted which will leave
2769 the work tree's current branch unmodified.
2771 If a merge conflict is resolved in a way which renders all merged
2772 changes into no-op changes, the merge operation cannot continue
2773 and must be aborted.
2776 will refuse to run if certain preconditions are not met.
2779 is based on the work tree's current branch, then no merge commit can
2782 may be used to integrate the
2785 If the work tree is not yet fully updated to the tip commit of its
2786 branch, then the work tree must first be updated with
2788 If the work tree contains multiple base commits, it must first be updated
2789 to a single base commit with
2791 If changes have been staged with
2793 these changes must first be committed with
2797 If the work tree contains local changes, these changes must first be
2804 contains changes to files outside of the work tree's path prefix,
2805 the work tree cannot be used to merge this branch.
2815 commands will refuse to run while a merge operation is in progress.
2816 Other commands which manipulate the work tree may be used for
2817 conflict resolution purposes.
2824 Abort an interrupted merge operation.
2825 If this option is used, no other command-line arguments are allowed.
2827 Continue an interrupted merge operation.
2828 If this option is used, no other command-line arguments are allowed.
2830 Merge changes into the work tree as usual but do not create a merge
2832 The merge result can be adjusted as desired before a merge commit is
2835 Alternatively, the merge may be aborted with
2842 .Op Fl F Ar response-script
2846 Stage local changes for inclusion in the next commit.
2849 is specified, stage all changes in the work tree.
2850 Otherwise, stage changes at or within the specified paths.
2851 Paths may be staged if they are added, modified, or deleted according to
2854 Show the status of each affected file, using the following status codes:
2855 .Bl -column YXZ description
2856 .It A Ta file addition has been staged
2857 .It M Ta file modification has been staged
2858 .It D Ta file deletion has been staged
2861 Staged file contents are saved in newly created blob objects in the repository.
2862 These blobs will be referred to by tree objects once staged changes have been
2865 Staged changes affect the behaviour of
2870 While paths with staged changes exist, the
2872 command will refuse to commit any paths which do not have staged changes.
2873 Local changes created on top of staged changes can only be committed if
2874 the path is staged again, or if the staged changes are committed first.
2877 command will show both local changes and staged changes.
2880 command is able to display local changes relative to staged changes,
2881 and to display staged changes relative to the repository.
2884 command cannot revert staged changes but may be used to revert
2885 local changes created on top of staged changes.
2891 .It Fl F Ar response-script
2899 responses line-by-line from the specified
2901 file instead of prompting interactively.
2903 Instead of staging new changes, list paths which are already staged,
2904 along with the IDs of staged blob objects and stage status codes.
2905 If paths were provided on the command line, show the staged paths
2906 among the specified paths.
2907 Otherwise, show all staged paths.
2909 Instead of staging the entire content of a changed file, interactively
2910 select or reject changes for staging based on
2914 (reject change), and
2916 (quit staging this file) responses.
2917 If a file is in modified status, individual patches derived from the
2918 modified file content can be staged.
2919 Files in added or deleted status may only be staged or rejected in
2922 Allow staging of symbolic links which point outside of the path space
2923 that is under version control.
2926 will reject such symbolic links due to safety concerns.
2929 may decide to represent such a symbolic link as a regular file which contains
2930 the link's target path, rather than creating an actual symbolic link which
2931 points outside of the work tree.
2932 Use of this option is discouraged because external mechanisms such as
2934 are better suited for managing symbolic links to paths not under
2939 will refuse to run if certain preconditions are not met.
2940 If a file contains merge conflicts, these conflicts must be resolved first.
2941 If a file is found to be out of date relative to the head commit on the
2942 work tree's current branch, the file must be updated with
2944 before it can be staged (however, this does not prevent the file from
2945 becoming out-of-date at some point after having been staged).
2952 commands will refuse to run while staged changes exist.
2953 If staged changes cannot be committed because a staged path
2954 is out of date, the path must be unstaged with
2956 before it can be updated with
2958 and may then be staged again if necessary.
2963 .Op Fl F Ar response-script
2967 Merge staged changes back into the work tree and put affected paths
2968 back into non-staged status.
2971 is specified, unstage all staged changes across the entire work tree.
2972 Otherwise, unstage changes at or within the specified paths.
2974 Show the status of each affected file, using the following status codes:
2975 .Bl -column YXZ description
2976 .It G Ta file was unstaged
2977 .It C Ta file was unstaged and conflicts occurred during merge
2978 .It ! Ta changes destined for a missing file were not merged
2979 .It D Ta file was staged as deleted and still is deleted
2980 .It d Ta file's deletion was prevented by local modifications
2981 .It \(a~ Ta changes destined for a non-regular file were not merged
2988 .It Fl F Ar response-script
2996 responses line-by-line from the specified
2998 file instead of prompting interactively.
3000 Instead of unstaging the entire content of a changed file, interactively
3001 select or reject changes for unstaging based on
3005 (keep change staged), and
3007 (quit unstaging this file) responses.
3008 If a file is staged in modified status, individual patches derived from the
3009 staged file content can be unstaged.
3010 Files staged in added or deleted status may only be unstaged in their entirety.
3016 .Op Fl r Ar repository-path
3019 Parse and print contents of objects to standard output in a line-based
3021 Content of commit, tree, and tag objects is printed in a way similar
3022 to the actual content stored in such objects.
3023 Blob object contents are printed as they would appear in files on disk.
3025 Attempt to interpret each argument as a reference, a tag name, or
3026 an object ID SHA1 hash.
3027 References will be resolved to an object ID.
3028 Tag names will resolved to a tag object.
3029 An abbreviated hash argument will be expanded to a full SHA1 hash
3030 automatically, provided the abbreviation is unique.
3032 If none of the above interpretations produce a valid result, or if the
3034 option is used, attempt to interpret the argument as a path which will
3035 be resolved to the ID of an object found at this path in the repository.
3042 Look up paths in the specified
3044 If this option is not used, paths are looked up in the commit resolved
3045 via the repository's HEAD reference.
3046 The expected argument is a commit ID SHA1 hash or an existing reference
3047 or tag name which will be resolved to a commit ID.
3048 An abbreviated hash argument will be expanded to a full SHA1 hash
3049 automatically, provided the abbreviation is unique.
3051 Interpret all arguments as paths only.
3052 This option can be used to resolve ambiguity in cases where paths
3053 look like tag names, reference names, or object IDs.
3054 .It Fl r Ar repository-path
3055 Use the repository at the specified path.
3056 If not specified, assume the repository is located at or above the current
3058 If this directory is a
3060 work tree, use the repository path associated with this work tree.
3062 .It Cm info Op Ar path ...
3063 Display meta-data stored in a work tree.
3068 The work tree to use is resolved implicitly by walking upwards from the
3069 current working directory.
3073 arguments are specified, show additional per-file information for tracked
3074 files located at or within these paths.
3077 argument corresponds to the work tree's root directory, display information
3078 for all tracked files.
3081 .Bl -tag -width GOT_IGNORE_GITCONFIG
3083 The author's name and email address, such as
3084 .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
3094 may fail to parse commits without an email address in author data,
3098 environment variables with a missing email address.
3100 .Ev GOT_AUTHOR will be overridden by configuration settings in
3106 configuration settings in the repository's
3113 configuration settings contained in Git's global
3115 configuration file will only be used if neither
3119 environment variable provide author information.
3120 .It Ev GOT_IGNORE_GITCONFIG
3121 If this variable is set then any remote repository definitions or author
3122 information found in Git configuration files will be ignored.
3123 .It Ev GOT_LOG_DEFAULT_LIMIT
3124 The default limit on the number of commits traversed by
3126 If set to zero, the limit is unbounded.
3127 This variable will be silently ignored if it is set to a non-numeric value.
3128 .It Ev VISUAL , EDITOR
3129 The editor spawned by
3137 text editor will be spawned in order to give
3139 the attention it deserves.
3142 .Bl -tag -width packed-refs -compact
3144 Repository-wide configuration settings for
3148 configuration file located in the root directory of a Git repository
3149 supersedes any relevant settings in Git's
3153 .It Pa .got/got.conf
3154 Worktree-specific configuration settings for
3158 configuration file in the
3160 meta-data directory of a work tree supersedes any relevant settings in
3163 configuration file and Git's
3170 Enable tab-completion of
3175 .Dl $ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
3177 Clone an existing Git repository for use with
3181 .Dl $ got clone ssh://git@github.com/openbsd/src.git
3183 Use of HTTP URLs currently requires
3187 .Dl $ git clone --bare https://github.com/openbsd/src.git
3189 Alternatively, for quick and dirty local testing of
3191 a new Git repository could be created and populated with files,
3192 e.g. from a temporary CVS checkout located at
3195 .Dl $ gotadmin init /var/git/src.git
3196 .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
3198 Check out a work tree from the Git repository to /usr/src:
3200 .Dl $ got checkout /var/git/src.git /usr/src
3202 View local changes in a work tree directory:
3204 .Dl $ got diff | less
3206 In a work tree, display files in a potentially problematic state:
3208 .Dl $ got status -s 'C!~?'
3210 Interactively revert selected local changes in a work tree directory:
3212 .Dl $ got revert -p -R\ .
3214 In a work tree or a git repository directory, list all branch references:
3218 As above, but list the most recently modified branches only:
3220 .Dl $ got branch -lt | head
3222 In a work tree or a git repository directory, create a new branch called
3223 .Dq unified-buffer-cache
3224 which is forked off the
3228 .Dl $ got branch -c master unified-buffer-cache
3230 Switch an existing work tree to the branch
3231 .Dq unified-buffer-cache .
3232 Local changes in the work tree will be preserved and merged if necessary:
3234 .Dl $ got update -b unified-buffer-cache
3236 Create a new commit from local changes in a work tree directory.
3237 This new commit will become the head commit of the work tree's current branch:
3241 In a work tree or a git repository directory, view changes committed in
3242 the 3 most recent commits to the work tree's branch, or the branch resolved
3243 via the repository's HEAD reference, respectively:
3245 .Dl $ got log -p -l 3
3247 As above, but display changes in the order in which
3249 could apply them in sequence:
3251 .Dl $ got log -p -l 3 -R
3253 In a work tree or a git repository directory, log the history of a subdirectory:
3255 .Dl $ got log sys/uvm
3257 While operating inside a work tree, paths are specified relative to the current
3258 working directory, so this command will log the subdirectory
3261 .Dl $ cd sys/uvm && got log\ .
3263 And this command has the same effect:
3265 .Dl $ cd sys/dev/usb && got log ../../uvm
3267 And this command displays work tree meta-data about all tracked files:
3270 .Dl $ got info\ . | less
3272 Add new files and remove obsolete files in a work tree directory:
3274 .Dl $ got add sys/uvm/uvm_ubc.c
3275 .Dl $ got remove sys/uvm/uvm_vnode.c
3277 Create a new commit from local changes in a work tree directory
3278 with a pre-defined log message.
3280 .Dl $ got commit -m 'unify the buffer cache'
3282 Alternatively, create a new commit from local changes in a work tree
3283 directory with a log message that has been prepared in the file
3286 .Dl $ got commit -F /tmp/msg
3288 Update any work tree checked out from the
3289 .Dq unified-buffer-cache
3290 branch to the latest commit on this branch:
3294 Roll file content on the unified-buffer-cache branch back by one commit,
3295 and then fetch the rolled-back change into the work tree as a local change
3296 to be amended and perhaps committed again:
3298 .Dl $ got backout unified-buffer-cache
3299 .Dl $ got commit -m 'roll back previous'
3300 .Dl $ # now back out the previous backout :-)
3301 .Dl $ got backout unified-buffer-cache
3303 Fetch new changes on the remote repository's
3305 branch, making them visible on the local repository's
3312 In a repository created with a HTTP URL and
3313 .Cm git clone --bare
3316 command must be used instead:
3318 .Dl $ cd /var/git/src.git
3319 .Dl $ git fetch origin master:refs/remotes/origin/master
3323 branch to merge the new changes that are now visible on the
3328 .Dl $ got update -b origin/master
3329 .Dl $ got rebase master
3332 .Dq unified-buffer-cache
3333 branch on top of the new head commit of the
3337 .Dl $ got update -b master
3338 .Dl $ got rebase unified-buffer-cache
3340 Create a patch from all changes on the unified-buffer-cache branch.
3341 The patch can be mailed out for review and applied to
3345 .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
3347 Edit the entire commit history of the
3348 .Dq unified-buffer-cache
3351 .Dl $ got update -b unified-buffer-cache
3352 .Dl $ got update -c master
3355 Before working against existing branches in a repository cloned with
3356 .Cm git clone --bare
3361 must be configured to map all references in the remote repository
3364 namespace of the local repository.
3365 This can be achieved by setting Git's
3366 .Pa remote.origin.fetch
3367 configuration variable to the value
3368 .Dq +refs/heads/*:refs/remotes/origin/*
3373 .Dl $ cd /var/git/repo
3374 .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
3378 option must be disabled:
3380 .Dl $ cd /var/git/repo
3381 .Dl $ git config remote.origin.mirror false
3383 Alternatively, the following
3385 configuration item can be added manually to the Git repository's
3389 .Dl [remote \&"origin\&"]
3391 .Dl fetch = +refs/heads/*:refs/remotes/origin/*
3394 This configuration leaves the local repository's
3396 namespace free for use by local branches checked out with
3398 and, if needed, created with
3401 .Dq refs/remotes/origin
3402 namespace can now be updated with incoming changes from the remote
3407 without extra command line arguments.
3408 Newly fetched changes can be examined with
3411 Display changes on the remote repository's version of the
3413 branch, as of the last time
3417 .Dl $ got log -c origin/master | less
3419 As shown here, most commands accept abbreviated reference names such as
3422 .Dq refs/remotes/origin/master .
3423 The latter is only needed in case of ambiguity.
3426 must be used to merge changes which are visible on the
3431 This will also merge local changes, if any, with the incoming changes:
3433 .Dl $ got update -b origin/master
3434 .Dl $ got rebase master
3436 In order to make changes committed to the
3437 .Dq unified-buffer-cache
3441 .Dq unified-buffer-cache
3442 branch must first be rebased onto the
3446 .Dl $ got update -b master
3447 .Dl $ got rebase unified-buffer-cache
3450 .Dq unified-buffer-cache
3451 branch can now be made visible on the
3455 Because the rebase operation switched the work tree to the
3456 .Dq unified-buffer-cache
3457 branch, the work tree must be switched back to the
3461 .Dl $ got update -b master
3462 .Dl $ got integrate unified-buffer-cache
3466 branch, log messages for local changes can now be amended with
3468 by other developers and any other important new information:
3470 .Dl $ got update -c origin/master
3471 .Dl $ got histedit -m
3473 If the remote repository offers write access, local changes on the
3475 branch can be sent to the remote repository with
3479 can be run without further arguments.
3480 The arguments shown here match defaults, provided the work tree's
3481 current branch is the
3485 .Dl $ got send -b master origin
3487 If the remote repository requires the HTTPS protocol, the
3489 command must be used instead:
3491 .Dl $ cd /var/git/src.git
3492 .Dl $ git push origin master
3494 When making contributions to projects which use the
3496 workflow, SSH protocol repository access needs to be set up first.
3497 Once an account has been created on a Git hosting site it should
3498 be possible to upload a public SSH key for repository access
3503 workflow will usually involve two remote repositories.
3504 In the real-life example below, the
3506 repository was forked from the
3508 repository by using the Git hosting site's web interface.
3511 file in the local repository describes both remote repositories:
3512 .Bd -literal -offset indent
3513 # Jelmers's repository, which accepts pull requests
3515 server git@github.com
3517 repository "/jelmer/dulwich"
3521 # Stefan's fork, used as the default remote repository
3523 server git@github.com
3525 repository "/stspdotname/dulwich"
3530 With this configuration, Stefan can create commits on
3531 .Dq refs/heads/master
3532 and send them to the
3534 repository by running:
3536 .Dl $ got send -b master origin
3538 The changes can now be proposed to Jelmer by opening a pull request
3539 via the Git hosting site's web interface.
3540 If Jelmer requests further changes to be made, additional commits
3541 can be created on the
3543 branch and be added to the pull request by running
3547 If Jelmer prefers additional commits to be
3549 then the following commands can be used to achieve this:
3551 .Dl $ got update -b master
3552 .Dl $ got update -c origin/master
3553 .Dl $ got histedit -f
3554 .Dl $ got send -f -b master origin
3556 Once Jelmer has accepted the pull request, Stefan can fetch the
3557 merged changes, and possibly several other new changes, by running:
3559 .Dl $ got fetch upstream
3561 The merged changes will now be visible under the reference
3562 .Dq refs/remotes/upstream/master .
3565 branch can now be rebased on top of the latest changes
3568 .Dl $ got update -b upstream/master
3569 .Dl $ got rebase master
3571 As a final step, the forked repository's copy of the master branch needs
3572 to be kept in sync by sending the new changes there:
3574 .Dl $ got send -f -b master origin
3576 If multiple pull requests need to be managed in parallel, a separate branch
3577 must be created for each pull request with
3579 Each such branch can then be used as above, in place of
3580 .Dq refs/heads/master .
3581 Changes for any accepted pull requests will still appear under
3582 .Dq refs/remotes/upstream/master,
3583 regardless of which branch was used in the forked repository to
3584 create a pull request.
3588 .Xr git-repository 5 ,
3589 .Xr got-worktree 5 ,
3593 .An Anthony J. Bentley Aq Mt bentley@openbsd.org
3594 .An Christian Weisgerber Aq Mt naddy@openbsd.org
3595 .An Hiltjo Posthuma Aq Mt hiltjo@codemadness.org
3596 .An Josh Rickmar Aq Mt jrick@zettaport.com
3597 .An Joshua Stein Aq Mt jcs@openbsd.org
3598 .An Klemens Nanni Aq Mt kn@openbsd.org
3599 .An Martin Pieuchot Aq Mt mpi@openbsd.org
3600 .An Neels Hofmeyr Aq Mt neels@hofmeyr.de
3601 .An Omar Polo Aq Mt op@openbsd.org
3602 .An Ori Bernstein Aq Mt ori@openbsd.org
3603 .An Sebastien Marie Aq Mt semarie@openbsd.org
3604 .An Stefan Sperling Aq Mt stsp@openbsd.org
3605 .An Steven McDonald Aq Mt steven@steven-mcdonald.id.au
3606 .An Theo Buehler Aq Mt tb@openbsd.org
3607 .An Thomas Adam Aq Mt thomas@xteddy.org
3608 .An Tracey Emery Aq Mt tracey@traceyemery.net
3609 .An Yang Zhong Aq Mt yzhong@freebsdfoundation.org
3616 were derived from code under copyright by:
3618 .An Caldera International
3619 .An Daniel Hartmeier
3624 .An Jean-Francois Brousseau
3630 .An Niklas Hallqvist
3635 .An Xavier Santolaria
3638 contains code contributed to the public domain by
3639 .An Austin Appleby .
3642 is a work-in-progress and some features remain to be implemented.
3644 At present, the user has to fall back on
3646 to perform some tasks.
3650 Reading from remote repositories over HTTP or HTTPS protocols requires
3655 Writing to remote repositories over HTTP or HTTPS protocols requires
3658 The creation of merge commits with more than two parent commits requires
3661 In situations where files or directories were moved around
3663 will not automatically merge changes to new locations and
3665 will usually produce better results.
