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 By default, any branches configured in
348 .Ar remote-repository
352 is invoked in a work tree then this work tree's current branch will be
353 fetched, too, provided it is present on the server.
354 This default behaviour can be overridden with the
359 If no branches to fetch can be found in
361 on the command line, or via a work tree, a branch resolved via the remote
362 repository's HEAD reference will be fetched.
364 New changes will be stored in a separate pack file downloaded from the server.
365 Optionally, separate pack files stored in the repository can be combined with
368 By default, branch references in the
370 reference namespace will be updated to point at the newly fetched commits.
373 command can then be used to make new changes visible on branches in the
375 namespace, merging incoming changes with the changes on those branches
378 If the repository was created as a mirror with
380 then all branches in the
382 namespace will be updated directly to match the corresponding branches in
383 the remote repository.
384 If those branches contained local commits, these commits will no longer be
385 reachable via a reference and will therefore be at risk of being discarded
386 by Git's garbage collector or
387 .Cm gotadmin cleanup .
388 Maintaining custom changes in a mirror repository is therefore discouraged.
390 In any case, references in the
392 namespace will always be fetched and mapped directly to local references
393 in the same namespace.
400 Fetch all branches from the remote repository's
403 This option can be enabled by default for specific repositories in
405 Cannot be used together with the
411 from the remote repository's
414 This option may be specified multiple times to build a list of branches
416 Cannot be used together with the
420 Delete branches and tags from the local repository which are no longer
421 present in the remote repository.
422 Only references are deleted.
423 Any commit, tree, tag, and blob objects belonging to deleted branches or
424 tags remain in the repository and may be removed separately with
425 Git's garbage collector or
426 .Cm gotadmin cleanup .
428 List branches and tags available for fetching from the remote repository
429 and exit immediately.
430 Cannot be used together with any of the other options except
436 Suppress progress reporting output.
437 The same option will be passed to
440 .It Fl R Ar reference
441 In addition to the branches and tags that will be fetched, fetch an arbitrary
443 from the remote repository's
446 This option may be specified multiple times to build a list of additional
450 may either be a path to a specific reference, or a reference namespace
451 which will cause all references in this namespace to be fetched.
453 Each reference will be mapped into the local repository's
455 namespace, unless the local repository was created as a mirror with
457 in which case references will be mapped directly into the local repository's
461 Once a reference has been fetched, a branch based on it can be created with
466 will refuse to fetch references from the remote repository's
471 .It Fl r Ar repository-path
472 Use the repository at the specified path.
473 If not specified, assume the repository is located at or above the current
475 If this directory is a
477 work tree, use the repository path associated with this work tree.
479 Allow existing references in the
481 namespace to be updated if they have changed on the server.
482 If not specified, only new tag references will be created.
487 to print debugging messages to standard error output.
488 The same option will be passed to
491 Multiple -v options increase the verbosity.
494 Delete all references which correspond to a particular
495 .Ar remote-repository
496 instead of fetching new changes.
497 This can be useful when a remote repository is being removed from
503 .Ar remote-repository
504 argument is mandatory and no other options except
511 Only references are deleted.
512 Any commit, tree, tag, and blob objects fetched from a remote repository
513 will generally be stored in pack files and may be removed separately with
515 and Git's garbage collector.
523 .Op Fl p Ar path-prefix
525 .Op Ar work-tree-path
528 Copy files from a repository into a new work tree.
529 Show the status of each affected file, using the following status codes:
530 .Bl -column YXZ description
531 .It A Ta new file was added
532 .It E Ta file already exists in work tree's meta-data
537 is not specified, either use the last component of
538 .Ar repository path ,
541 was specified use the last component of
549 Check out files from a commit on the specified
551 If this option is not specified, a branch resolved via the repository's HEAD
552 reference will be used.
554 Check out files from the specified
556 on the selected branch.
557 The expected argument is a commit ID SHA1 hash or an existing reference
558 or tag name which will be resolved to a commit ID.
559 An abbreviated hash argument will be expanded to a full SHA1 hash
560 automatically, provided the abbreviation is unique.
561 If this option is not specified, the most recent commit on the selected
566 is not contained in the selected branch, a different branch which contains
567 this commit must be specified with the
570 If no such branch is known, a new branch must be created for this
576 Checking out work trees with an unknown branch is intentionally not supported.
578 Proceed with the checkout operation even if the directory at
581 Existing files will be left intact.
582 .It Fl p Ar path-prefix
583 Restrict the work tree to a subset of the repository's tree hierarchy.
584 Only files beneath the specified
588 Silence progress output.
599 Update an existing work tree to a different
601 Change existing files in the work tree as necessary to match file contents
603 Preserve any local changes in the work tree and merge them with the
606 Files which already contain merge conflicts will not be updated to avoid
607 further complications.
608 Such files will be updated when
610 is run again after merge conflicts have been resolved.
611 If the conflicting changes are no longer needed, affected files can be
618 Show the status of each affected file, using the following status codes:
619 .Bl -column YXZ description
620 .It U Ta file was updated and contained no local changes
621 .It G Ta file was updated and local changes were merged cleanly
622 .It C Ta file was updated and conflicts occurred during merge
623 .It D Ta file was deleted
624 .It A Ta new file was added
625 .It \(a~ Ta versioned file is obstructed by a non-regular file
626 .It ! Ta a missing versioned file was restored
627 .It # Ta file was not updated because it contains merge conflicts
628 .It ? Ta changes destined for an unversioned file were not merged
633 is specified, update the entire work tree.
634 Otherwise, restrict the update operation to files at or within the
636 Each path is required to exist in the update operation's target commit.
637 Files in the work tree outside specified paths will remain unchanged and
638 will retain their previously recorded base commit.
641 commands may refuse to run while the work tree contains files from
642 multiple base commits.
643 The base commit of such a work tree can be made consistent by running
645 across the entire work tree.
648 is incompatible with the
653 cannot update paths with staged changes.
654 If changes have been staged with
656 these changes must first be committed with
666 Switch the work tree's branch reference to the specified
668 before updating the work tree.
669 This option requires that all paths in the work tree are updated.
671 As usual, any local changes in the work tree will be preserved.
672 This can be useful when switching to a newly created branch in order
673 to commit existing local changes to this branch.
675 Any local changes must be dealt with separately in order to obtain a
676 work tree with pristine file contents corresponding exactly to the specified
678 Such changes could first be committed to a different branch with
680 or could be discarded with
683 Update the work tree to the specified
685 The expected argument is a commit ID SHA1 hash or an existing reference
686 or tag name which will be resolved to a commit ID.
687 An abbreviated hash argument will be expanded to a full SHA1 hash
688 automatically, provided the abbreviation is unique.
689 If this option is not specified, the most recent commit on the work tree's
692 Silence progress output.
698 .Op Fl S Ar status-codes
699 .Op Fl s Ar status-codes
703 Show the current modification status of files in a work tree,
704 using the following status codes:
705 .Bl -column YXZ description
706 .It M Ta modified file
707 .It A Ta file scheduled for addition in next commit
708 .It D Ta file scheduled for deletion in next commit
709 .It C Ta modified or added file which contains merge conflicts
710 .It ! Ta versioned file was expected on disk but is missing
711 .It \(a~ Ta versioned file is obstructed by a non-regular file
712 .It ? Ta unversioned item not tracked by
714 .It m Ta modified file modes (executable bit only)
715 .It N Ta non-existent
717 specified on the command line
722 is specified, show modifications in the entire work tree.
723 Otherwise, show modifications at or within the specified paths.
725 If changes have been staged with
727 staged changes are shown in the second output column, using the following
729 .Bl -column YXZ description
730 .It M Ta file modification is staged
731 .It A Ta file addition is staged
732 .It D Ta file deletion is staged
735 Changes created on top of staged changes are indicated in the first column:
736 .Bl -column YXZ description
737 .It MM Ta file was modified after earlier changes have been staged
738 .It MA Ta file was modified after having been staged for addition
746 Show unversioned files even if they match an ignore pattern.
747 .It Fl S Ar status-codes
748 Suppress the output of files with a modification status matching any of the
749 single-character status codes contained in the
752 Any combination of codes from the above list of possible status codes
754 For staged files, status codes displayed in either column will be matched.
755 Cannot be used together with the
758 .It Fl s Ar status-codes
759 Only show files with a modification status matching any of the
760 single-character status codes contained in the
763 Any combination of codes from the above list of possible status codes
765 For staged files, status codes displayed in either column will be matched.
766 Cannot be used together with the
771 For compatibility with
782 files in each traversed directory and will not display unversioned files
783 which match these patterns.
788 supports consecutive asterisks,
790 which will match an arbitrary amount of directories.
794 only supports a single ignore pattern per line.
798 does not support negated ignore patterns prefixed with
800 and gives no special significance to the location of path component separators,
809 .Op Fl r Ar repository-path
810 .Op Fl S Ar search-pattern
814 Display history of a repository.
817 is specified, show only commits which modified this path.
818 If invoked in a work tree, the
820 is interpreted relative to the current working directory,
821 and the work tree's path prefix is implicitly prepended.
822 Otherwise, the path is interpreted relative to the repository root.
829 Display individual commits which were merged into the current branch
833 shows the linear history of the current branch only.
835 Set the number of context lines shown in diffs with
837 By default, 3 lines of context are shown.
839 Start traversing history at the specified
841 The expected argument is a commit ID SHA1 hash or an existing reference
842 or tag name which will be resolved to a commit ID.
843 An abbreviated hash argument will be expanded to a full SHA1 hash
844 automatically, provided the abbreviation is unique.
845 If this option is not specified, default to the work tree's current branch
846 if invoked in a work tree, or to the repository's HEAD reference.
848 Display diffstat of changes introduced in each commit.
849 Cannot be used with the
853 Limit history traversal to a given number of commits.
854 If this option is not specified, a default limit value of zero is used,
855 which is treated as an unbounded limit.
857 .Ev GOT_LOG_DEFAULT_LIMIT
858 environment variable may be set to change this default value.
860 Display the list of file paths changed in each commit, using the following
862 .Bl -column YXZ description
863 .It M Ta modified file
864 .It D Ta file was deleted
865 .It A Ta new file was added
866 .It m Ta modified file modes (executable bit only)
869 Cannot be used with the
873 Display the patch of modifications made in each commit.
876 is specified, only show the patch of modifications at or within this path.
877 Cannot be used with the
881 Determine a set of commits to display as usual, but display these commits
883 .It Fl r Ar repository-path
884 Use the repository at the specified path.
885 If not specified, assume the repository is located at or above the current
887 If this directory is a
889 work tree, use the repository path associated with this work tree.
890 .It Fl S Ar search-pattern
891 If specified, show only commits with a log message, author name,
892 committer name, or ID SHA1 hash matched by the extended regular
895 Lines in committed patches will be matched if
898 File paths changed by a commit will be matched if
901 Regular expression syntax is documented in
904 Display a short one-line summary of each commit, instead of the default
906 Cannot be used together with the
912 Stop traversing commit history immediately after the specified
915 This option has no effect if the specified
925 .Op Fl r Ar repository-path
926 .Op Ar object1 Ar object2 | Ar path ...
929 When invoked within a work tree without any arguments, display all
930 local changes in the work tree.
933 arguments are specified, only show changes within the specified paths.
935 If two arguments are provided, treat each argument as a reference, a tag
936 name, or an object ID SHA1 hash, and display differences between the
937 corresponding objects.
938 Both objects must be of the same type (blobs, trees, or commits).
939 An abbreviated hash argument will be expanded to a full SHA1 hash
940 automatically, provided the abbreviation is unique.
941 If none of these interpretations produce a valid result or if the
946 is running in a work tree, attempt to interpret the two arguments as paths.
953 Treat file contents as ASCII text even if binary data is detected.
955 Set the number of context lines shown in the diff.
956 By default, 3 lines of context are shown.
958 Show differences between commits in the repository.
959 This option may be used up to two times.
960 When used only once, show differences between the specified
962 and its first parent commit.
963 When used twice, show differences between the two specified commits.
965 The expected argument is a commit ID SHA1 hash or an existing reference
966 or tag name which will be resolved to a commit ID.
967 An abbreviated hash argument will be expanded to a full SHA1 hash
968 automatically, provided the abbreviation is unique.
972 option is used, all non-option arguments will be interpreted as paths.
975 arguments are provided, only show differences for the specified paths.
977 Cannot be used together with the
981 Display diffstat of changes before the actual diff by annotating each file path
982 or blob hash being diffed with the total number of lines added and removed.
983 A summary line will display the total number of changes across all files.
985 Interpret all arguments as paths only.
986 This option can be used to resolve ambiguity in cases where paths
987 look like tag names, reference names, or object IDs.
988 This option is only valid when
990 is invoked in a work tree.
991 .It Fl r Ar repository-path
992 Use the repository at the specified path.
993 If not specified, assume the repository is located at or above the current
995 If this directory is a
997 work tree, use the repository path associated with this work tree.
999 Show changes staged with
1001 instead of showing local changes in the work tree.
1002 This option is only valid when
1004 is invoked in a work tree.
1006 Ignore whitespace-only changes.
1012 .Op Fl r Ar repository-path
1016 Display line-by-line history of a file at the specified path.
1023 Start traversing history at the specified
1025 The expected argument is a commit ID SHA1 hash or an existing reference
1026 or tag name which will be resolved to a commit ID.
1027 An abbreviated hash argument will be expanded to a full SHA1 hash
1028 automatically, provided the abbreviation is unique.
1029 .It Fl r Ar repository-path
1030 Use the repository at the specified path.
1031 If not specified, assume the repository is located at or above the current
1033 If this directory is a
1035 work tree, use the repository path associated with this work tree.
1042 .Op Fl r Ar repository-path
1046 Display a listing of files and directories at the specified
1047 directory path in the repository.
1048 Entries shown in this listing may carry one of the following trailing
1050 .Bl -column YXZ description
1051 .It @ Ta entry is a symbolic link
1052 .It / Ta entry is a directory
1053 .It * Ta entry is an executable file
1054 .It $ Ta entry is a Git submodule
1057 Symbolic link entries are also annotated with the target path of the link.
1061 is specified, list the repository path corresponding to the current
1062 directory of the work tree, or the root directory of the repository
1063 if there is no work tree.
1070 List files and directories as they appear in the specified
1072 The expected argument is a commit ID SHA1 hash or an existing reference
1073 or tag name which will be resolved to a commit ID.
1074 An abbreviated hash argument will be expanded to a full SHA1 hash
1075 automatically, provided the abbreviation is unique.
1077 Show object IDs of files (blob objects) and directories (tree objects).
1079 Recurse into sub-directories in the repository.
1080 .It Fl r Ar repository-path
1081 Use the repository at the specified path.
1082 If not specified, assume the repository is located at or above the current
1084 If this directory is a
1086 work tree, use the repository path associated with this work tree.
1092 .Op Fl r Ar repository-path
1093 .Op Fl s Ar reference
1096 Manage references in a repository.
1098 References may be listed, created, deleted, and changed.
1099 When creating, deleting, or changing a reference the specified
1101 must be an absolute reference name, i.e. it must begin with
1109 Create a reference or change an existing reference.
1110 The reference with the specified
1112 will point at the specified
1116 argument is a ID SHA1 hash or an existing reference or tag name which will
1117 be resolved to the ID of a corresponding commit, tree, tag, or blob object.
1118 Cannot be used together with any other options except
1121 Delete the reference with the specified
1123 from the repository.
1124 Any commit, tree, tag, and blob objects belonging to deleted references
1125 remain in the repository and may be removed separately with
1126 Git's garbage collector or
1127 .Cm gotadmin cleanup .
1128 Cannot be used together with any other options except
1131 List references in the repository.
1134 is specified, list all existing references in the repository.
1137 is a reference namespace, list all references in this namespace.
1138 Otherwise, show only the reference with the given
1140 Cannot be used together with any other options except
1144 .It Fl r Ar repository-path
1145 Use the repository at the specified path.
1146 If not specified, assume the repository is located at or above the current
1148 If this directory is a
1150 work tree, use the repository path associated with this work tree.
1151 .It Fl s Ar reference
1152 Create a symbolic reference, or change an existing symbolic reference.
1153 The symbolic reference with the specified
1155 will point at the specified
1157 which must already exist in the repository.
1158 Care should be taken not to create loops between references when
1159 this option is used.
1160 Cannot be used together with any other options except
1163 Sort listed references by modification time (most recently modified first)
1164 instead of sorting by lexicographical order.
1165 Use of this option requires the
1167 option to be used as well.
1175 .Op Fl r Ar repository-path
1179 Create, list, or delete branches.
1181 Local branches are managed via references which live in the
1183 reference namespace.
1186 command creates references in this namespace only.
1188 When deleting branches, the specified
1192 reference namespace first.
1193 If no corresponding branch is found, the
1195 namespace will be searched next.
1197 If invoked in a work tree without any arguments, print the name of the
1198 work tree's current branch.
1202 argument is passed, attempt to create a branch reference with the given name.
1203 By default the new branch reference will point at the latest commit on the
1204 work tree's current branch if invoked in a work tree, and otherwise to a commit
1205 resolved via the repository's HEAD reference.
1207 If invoked in a work tree, once the branch was created successfully
1208 switch the work tree's head reference to the newly created branch and
1209 update files across the entire work tree, just like
1210 .Cm got update -b Ar name
1212 Show the status of each affected file, using the following status codes:
1213 .Bl -column YXZ description
1214 .It U Ta file was updated and contained no local changes
1215 .It G Ta file was updated and local changes were merged cleanly
1216 .It C Ta file was updated and conflicts occurred during merge
1217 .It D Ta file was deleted
1218 .It A Ta new file was added
1219 .It \(a~ Ta versioned file is obstructed by a non-regular file
1220 .It ! Ta a missing versioned file was restored
1228 Make a newly created branch reference point at the specified
1232 argument is a commit ID SHA1 hash or an existing reference
1233 or tag name which will be resolved to a commit ID.
1235 Delete the branch with the specified
1241 reference namespace.
1243 Only the branch reference is deleted.
1244 Any commit, tree, and blob objects belonging to the branch
1245 remain in the repository and may be removed separately with
1246 Git's garbage collector or
1247 .Cm gotadmin cleanup .
1249 List all existing branches in the repository, including copies of remote
1250 repositories' branches in the
1252 reference namespace.
1254 If invoked in a work tree, the work tree's current branch is shown
1255 with one the following annotations:
1256 .Bl -column YXZ description
1257 .It * Ta work tree's base commit matches the branch tip
1258 .It \(a~ Ta work tree's base commit is out-of-date
1261 Do not switch and update the work tree after creating a new branch.
1262 .It Fl r Ar repository-path
1263 Use the repository at the specified path.
1264 If not specified, assume the repository is located at or above the current
1266 If this directory is a
1268 work tree, use the repository path associated with this work tree.
1270 Sort listed branches by modification time (most recently modified first)
1271 instead of sorting by lexicographical order.
1274 reference namespace are listed before branches in
1277 Use of this option requires the
1279 option to be used as well.
1286 .Op Fl r Ar repository-path
1287 .Op Fl s Ar signer-id
1290 Manage tags in a repository.
1292 Tags are managed via references which live in the
1294 reference namespace.
1297 command operates on references in this namespace only.
1298 References in this namespace point at tag objects which contain a pointer
1299 to another object, a tag message, as well as author and timestamp information.
1301 Attempt to create a tag with the given
1303 and make this tag point at the given
1305 If no commit is specified, default to the latest commit on the work tree's
1306 current branch if invoked in a work tree, and to a commit resolved via
1307 the repository's HEAD reference otherwise.
1314 Make the newly created tag reference point at the specified
1318 argument is a commit ID SHA1 hash or an existing reference or tag name which
1319 will be resolved to a commit ID.
1320 An abbreviated hash argument will be expanded to a full SHA1 hash
1321 automatically, provided the abbreviation is unique.
1323 List all existing tags in the repository instead of creating a new tag.
1326 argument is passed, show only the tag with the given
1329 Use the specified tag message when creating the new tag.
1334 opens a temporary file in an editor where a tag message can be written.
1335 .It Fl r Ar repository-path
1336 Use the repository at the specified path.
1337 If not specified, assume the repository is located at or above the current
1339 If this directory is a
1341 work tree, use the repository path associated with this work tree.
1342 .It Fl s Ar signer-id
1343 While creating a new tag, sign this tag with the identity given in
1346 For SSH-based signatures,
1348 is the path to a file which may refer to either a private SSH key,
1349 or a public SSH key with the private half available via
1352 will sign the tag object by invoking
1356 command, using the signature namespace
1358 for compatibility with
1361 Verify tag object signatures.
1364 is specified, show and verify the tag object with the provided name.
1365 Otherwise, list all tag objects and verify signatures where present.
1368 verifies SSH-based signatures by invoking
1371 .Fl Y Cm verify Fl f Ar allowed_signers .
1376 otherwise verification is impossible.
1379 During SSH signature creation and verification this option will be passed to
1381 Multiple -v options increase the verbosity.
1387 command will not delete tags or change existing tags.
1388 If a tag must be deleted, the
1390 command may be used to delete a tag's reference.
1391 This should only be done if the tag has not already been copied to
1398 Schedule unversioned files in a work tree for addition to the
1399 repository in the next commit.
1400 By default, files which match a
1402 ignore pattern will not be added.
1409 Add files even if they match a
1413 Permit recursion into directories.
1414 If this option is not specified,
1416 will refuse to run if a specified
1424 .Op Fl s Ar status-codes
1428 Remove versioned files from a work tree and schedule them for deletion
1429 from the repository in the next commit.
1436 Perform the operation even if a file contains local modifications,
1437 and do not raise an error if a specified
1439 does not exist on disk.
1441 Keep affected files on disk.
1443 Permit recursion into directories.
1444 If this option is not specified,
1446 will refuse to run if a specified
1449 .It Fl s Ar status-codes
1450 Only delete files with a modification status matching one of the
1451 single-character status codes contained in the
1454 The following status codes may be specified:
1455 .Bl -column YXZ description
1456 .It M Ta modified file (this implies the
1459 .It ! Ta versioned file expected on disk but missing
1467 .Op Fl p Ar strip-count
1473 to files in a work tree.
1474 Files added or removed by a patch will be scheduled for addition or removal in
1477 The patch must be in the unified diff format as produced by
1484 diff when invoked with their
1489 argument is provided, read unified diff data from standard input instead.
1493 contains multiple patches, then attempt to apply each of them in sequence.
1495 Show the status of each affected file, using the following status codes:
1496 .Bl -column XYZ description
1497 .It M Ta file was modified
1498 .It G Ta file was merged using a merge-base found in the repository
1499 .It C Ta file was merged and conflicts occurred during merge
1500 .It D Ta file was deleted
1501 .It A Ta file was added
1502 .It # Ta failed to patch the file
1505 If a change does not match at its exact line number, attempt to
1506 apply it somewhere else in the file if a good spot can be found.
1507 Otherwise, the patch will fail to apply.
1511 will refuse to apply a patch if certain preconditions are not met.
1512 Files to be deleted must already be under version control, and must
1513 not have been scheduled for deletion already.
1514 Files to be added must not yet be under version control and must not
1515 already be present on disk.
1516 Files to be modified must already be under version control and may not
1517 contain conflict markers.
1519 If an error occurs, the
1521 operation will be aborted.
1522 Any changes made to the work tree up to this point will be left behind.
1523 Such changes can be viewed with
1525 and can be reverted with
1534 Attempt to locate files within the specified
1536 for use as a merge-base for 3-way merges.
1537 Ideally, the specified
1539 should contain versions of files which the changes contained in the
1542 Files will be located by path, relative to the repository root.
1545 option is used then leading path components will be stripped
1546 before paths are looked up in the repository.
1550 option is not used then
1552 will attempt to locate merge-bases via object IDs found in
1554 meta-data, such as produced by
1560 option is only recommended in the absence of such meta-data.
1562 In case no merge-base is available for a file, changes will be applied
1563 without doing a 3-way merge.
1564 Changes which do not apply cleanly may then be rejected entirely, rather
1565 than producing merge conflicts in the patched target file.
1567 Do not make any modifications to the work tree.
1568 This can be used to check whether a patch would apply without issues.
1571 contains diffs that affect the same file multiple times, the results
1572 displayed may be incorrect.
1573 .It Fl p Ar strip-count
1574 Specify the number of leading path components to strip from paths
1583 path prefixes generated by
1585 will be recognized and stripped automatically.
1587 Reverse the patch before applying it.
1593 .Op Fl F Ar response-script
1597 Revert any local changes in files at the specified paths in a work tree.
1598 File contents will be overwritten with those contained in the
1599 work tree's base commit.
1600 There is no way to bring discarded changes back after
1603 If a file was added with
1605 it will become an unversioned file again.
1606 If a file was deleted with
1608 it will be restored.
1614 .It Fl F Ar response-script
1622 responses line-by-line from the specified
1624 file instead of prompting interactively.
1626 Instead of reverting all changes in files, interactively select or reject
1627 changes to revert based on
1633 (quit reverting this file) responses.
1634 If a file is in modified status, individual patches derived from the
1635 modified file content can be reverted.
1636 Files in added or deleted status may only be reverted in their entirety.
1638 Permit recursion into directories.
1639 If this option is not specified,
1641 will refuse to run if a specified
1655 Create a new commit in the repository from changes in a work tree
1656 and use this commit as the new base commit for the work tree.
1659 is specified, commit all changes in the work tree.
1660 Otherwise, commit changes at or within the specified paths.
1662 If changes have been explicitly staged for commit with
1664 only commit staged changes and reject any specified paths which
1665 have not been staged.
1668 opens a temporary file in an editor where a log message can be written
1676 options are used together.
1678 Show the status of each affected file, using the following status codes:
1679 .Bl -column YXZ description
1680 .It M Ta modified file
1681 .It D Ta file was deleted
1682 .It A Ta new file was added
1683 .It m Ta modified file modes (executable bit only)
1686 Files which are not part of the new commit will retain their previously
1687 recorded base commit.
1690 commands may refuse to run while the work tree contains files from
1691 multiple base commits.
1692 The base commit of such a work tree can be made consistent by running
1694 across the entire work tree.
1698 command requires the
1700 environment variable to be set,
1701 unless an author has been configured in
1707 configuration settings can be
1708 obtained from the repository's
1710 file or from Git's global
1719 Set author information in the newly created commit to
1721 This is useful when committing changes which were written by someone
1725 argument must use the same format as the
1727 environment variable.
1729 In addition to storing author information, the newly created commit
1732 information which is obtained, as usual, from the
1734 environment variable, or
1736 or Git configuration settings.
1738 Use the prepared log message stored in the file found at
1740 when creating the new commit.
1742 opens a temporary file in an editor where the prepared log message can be
1743 reviewed and edited further if needed.
1744 Cannot be used together with the
1748 Use the specified log message when creating the new commit.
1749 Cannot be used together with the
1753 This option prevents
1755 from opening the commit message in an editor.
1756 It has no effect unless it is used together with the
1758 option and is intended for non-interactive use such as scripting.
1760 This option prevents
1762 from generating a diff of the to-be-committed changes in a temporary file
1763 which can be viewed while editing a commit message.
1765 Allow the addition of symbolic links which point outside of the path space
1766 that is under version control.
1769 will reject such symbolic links due to safety concerns.
1772 may decide to represent such a symbolic link as a regular file which contains
1773 the link's target path, rather than creating an actual symbolic link which
1774 points outside of the work tree.
1775 Use of this option is discouraged because external mechanisms such as
1777 are better suited for managing symbolic links to paths not under
1782 will refuse to run if certain preconditions are not met.
1783 If the work tree's current branch is not in the
1785 reference namespace, new commits may not be created on this branch.
1786 Local changes may only be committed if they are based on file content
1787 found in the most recent commit on the work tree's branch.
1788 If a path is found to be out of date,
1790 must be used first in order to merge local changes with changes made
1798 .Op Fl r Ar repository-path
1800 .Op Ar remote-repository
1803 Send new changes to a remote repository.
1805 .Ar remote-repository
1809 The remote repository's URL is obtained from the corresponding entry in
1813 file of the local repository, as created by
1816 All objects corresponding to new changes will be written to a temporary
1817 pack file which is then uploaded to the server.
1818 Upon success, references in the
1820 reference namespace of the local repository will be updated to point at
1821 the commits which have been sent.
1823 By default, changes will only be sent if they are based on up-to-date
1824 copies of relevant branches in the remote repository.
1825 If any changes to be sent are based on out-of-date copies or would
1826 otherwise break linear history of existing branches, new changes must
1827 be fetched from the server with
1829 and local branches must be rebased with
1836 option can be used to make exceptions to these requirements.
1843 Send all branches from the local repository's
1845 reference namespace.
1848 option is equivalent to listing all branches with multiple
1851 Cannot be used together with the
1857 from the local repository's
1859 reference namespace.
1860 This option may be specified multiple times to build a list of branches
1862 If this option is not specified, default to the work tree's current branch
1863 if invoked in a work tree, or to the repository's HEAD reference.
1864 Cannot be used together with the
1868 Delete the specified
1870 from the remote repository's
1872 reference namespace.
1873 This option may be specified multiple times to build a list of branches
1876 Only references are deleted.
1877 Any commit, tree, tag, and blob objects belonging to deleted branches
1878 may become subject to deletion by Git's garbage collector running on
1881 Requesting deletion of branches results in an error if the server
1882 does not support this feature or disallows the deletion of branches
1883 based on its configuration.
1885 Attempt to force the server to overwrite existing branches or tags
1886 in the remote repository, even when
1890 would usually be required before changes can be sent.
1891 The server may reject forced requests regardless, depending on its
1894 Any commit, tree, tag, and blob objects belonging to overwritten branches
1895 or tags may become subject to deletion by Git's garbage collector running
1900 reference namespace is globally shared between all repositories.
1903 option to overwrite tags is discouraged because it can lead to
1904 inconsistencies between the tags present in different repositories.
1905 In general, creating a new tag with a different name is recommended
1906 instead of overwriting an existing tag.
1910 option is particularly discouraged if changes being sent are based
1911 on an out-of-date copy of a branch in the remote repository.
1912 Instead of using the
1914 option, new changes should
1917 and local branches should be rebased with
1919 followed by another attempt to send the changes.
1923 option should only be needed in situations where the remote repository's
1924 copy of a branch or tag is known to be out-of-date and is considered
1926 The risks of creating inconsistencies between different repositories
1927 should also be taken into account.
1929 Suppress progress reporting output.
1930 The same option will be passed to
1933 .It Fl r Ar repository-path
1934 Use the repository at the specified path.
1935 If not specified, assume the repository is located at or above the current
1937 If this directory is a
1939 work tree, use the repository path associated with this work tree.
1941 Attempt to send all tags from the local repository's
1943 reference namespace.
1946 option is equivalent to listing all tags with multiple
1949 Cannot be used together with the
1955 from the local repository's
1957 reference namespace, in addition to any branches that are being sent.
1960 option may be specified multiple times to build a list of tags to send.
1961 No tags will be sent if the
1965 Raise an error if the specified
1967 already exists in the remote repository, unless the
1969 option is used to overwrite the server's copy of the tag.
1970 In general, creating a new tag with a different name is recommended
1971 instead of overwriting an existing tag.
1973 Cannot be used together with the
1980 to print debugging messages to standard error output.
1981 The same option will be passed to
1984 Multiple -v options increase the verbosity.
1994 Merge changes from a single
1999 should be on a different branch than the work tree's base commit.
2000 The expected argument is a reference or a commit ID SHA1 hash.
2001 An abbreviated hash argument will be expanded to a full SHA1 hash
2002 automatically, provided the abbreviation is unique.
2004 Show the status of each affected file, using the following status codes:
2005 .Bl -column YXZ description
2006 .It G Ta file was merged
2007 .It C Ta file was merged and conflicts occurred during merge
2008 .It ! Ta changes destined for a missing file were not merged
2009 .It D Ta file was deleted
2010 .It d Ta file's deletion was prevented by local modifications
2011 .It A Ta new file was added
2012 .It \(a~ Ta changes destined for a non-regular file were not merged
2013 .It ? Ta changes destined for an unversioned file were not merged
2016 The merged changes will appear as local changes in the work tree, which
2019 amended manually or with further
2025 If invoked in a work tree where no
2030 operation is taking place,
2032 creates a record of commits which have been merged into the work tree.
2033 When a file changed by
2037 the log messages of relevant merged commits will then appear in the editor,
2038 where the messages must be further adjusted to convey the reasons for
2039 cherrypicking the changes.
2040 If all the changes in all files touched by a given commit are discarded,
2043 this commit's log message record will also disappear.
2046 will refuse to run if certain preconditions are not met.
2047 If the work tree contains multiple base commits, it must first be updated
2048 to a single base commit with
2050 If any relevant files already contain merge conflicts, these
2051 conflicts must be resolved first.
2059 Display a list of commit log messages recorded by cherrypick operations,
2060 represented by references in the
2061 .Dq refs/got/worktree
2062 reference namespace.
2065 is specified, only show the log message of the specified commit.
2067 If invoked in a work tree, only log messages recorded by cherrypick operations
2068 in the current work tree will be displayed.
2069 Otherwise, all commit log messages will be displayed irrespective of the
2070 work tree in which they were created.
2071 This option cannot be used with
2074 Delete log messages created by previous cherrypick operations, represented by
2076 .Dq refs/got/worktree
2077 reference namespace.
2080 is specified, only delete the log message of the specified commit.
2082 If invoked in a work tree, only log messages recorded by cherrypick operations
2083 in the current work tree will be deleted.
2084 Otherwise, all commit log messages will be deleted irrespective of the
2085 work tree in which they were created.
2086 This option cannot be used with
2097 Reverse-merge changes from a single
2102 should be on the same branch as the work tree's base commit.
2103 The expected argument is a reference or a commit ID SHA1 hash.
2104 An abbreviated hash argument will be expanded to a full SHA1 hash
2105 automatically, provided the abbreviation is unique.
2107 Show the status of each affected file, using the following status codes:
2108 .Bl -column YXZ description
2109 .It G Ta file was merged
2110 .It C Ta file was merged and conflicts occurred during merge
2111 .It ! Ta changes destined for a missing file were not merged
2112 .It D Ta file was deleted
2113 .It d Ta file's deletion was prevented by local modifications
2114 .It A Ta new file was added
2115 .It \(a~ Ta changes destined for a non-regular file were not merged
2116 .It ? Ta changes destined for an unversioned file were not merged
2119 The reverse-merged changes will appear as local changes in the work tree,
2120 which may be viewed with
2122 amended manually or with further
2128 If invoked in a work tree where no
2133 operation is taking place,
2135 creates a record of commits which have been reverse-merged into the work tree.
2136 When a file changed by
2140 the log messages of relevant reverse-merged commits will then appear in
2141 the editor, where the messages must be further adjusted to convey the
2142 reasons for backing out the changes.
2143 If all the changes in all files touched by a given commit are discarded,
2146 this commit's log message record will also disappear.
2149 will refuse to run if certain preconditions are not met.
2150 If the work tree contains multiple base commits, it must first be updated
2151 to a single base commit with
2153 If any relevant files already contain merge conflicts, these
2154 conflicts must be resolved first.
2162 Display a list of commit log messages recorded by backout operations,
2163 represented by references in the
2164 .Dq refs/got/worktree
2165 reference namespace.
2168 is specified, only show the log message of the specified commit.
2170 If invoked in a work tree, only log messages recorded by backout operations
2171 in the current work tree will be displayed.
2172 Otherwise, all commit log messages will be displayed irrespective of the
2173 work tree in which they were created.
2174 This option cannot be used with
2177 Delete log messages created by previous backout operations, represented by
2179 .Dq refs/got/worktree
2180 reference namespace.
2183 is specified, only delete the log message of the specified commit.
2185 If invoked in a work tree, only log messages recorded by backout operations
2186 in the current work tree will be deleted.
2187 Otherwise, all commit log messages will be deleted irrespective of the
2188 work tree in which they were created.
2189 This option cannot be used with
2200 Rebase commits on the specified
2202 onto the tip of the current branch of the work tree.
2205 must share common ancestry with the work tree's current branch.
2206 Rebasing begins with the first descendant commit of the youngest
2207 common ancestor commit shared by the specified
2209 and the work tree's current branch, and stops once the tip commit
2216 is used as intended, the specified
2218 represents a local commit history and may already contain changes
2219 that are not yet visible in any other repositories.
2220 The work tree's current branch, which must be set with
2224 operation, represents a branch from a remote repository which shares
2225 a common history with the specified
2227 but has progressed, and perhaps diverged, due to commits added to the
2230 Rebased commits are accumulated on a temporary branch which the work tree
2231 will remain switched to throughout the entire rebase operation.
2232 Commits on this branch represent the same changes with the same log
2233 messages as their counterparts on the original
2235 but with different commit IDs.
2236 Once rebasing has completed successfully, the temporary branch becomes
2237 the new version of the specified
2239 and the work tree is automatically switched to it.
2240 If author information is available via the
2242 environment variable,
2248 configuration settings, this author information will be used to identify
2253 Old commits in their pre-rebase state are automatically backed up in the
2254 .Dq refs/got/backup/rebase
2255 reference namespace.
2256 As long as these references are not removed older versions of rebased
2257 commits will remain in the repository and can be viewed with the
2260 Removal of these references makes objects which become unreachable via
2261 any reference subject to removal by Git's garbage collector or
2262 .Cm gotadmin cleanup .
2264 While rebasing commits, show the status of each affected file,
2265 using the following status codes:
2266 .Bl -column YXZ description
2267 .It G Ta file was merged
2268 .It C Ta file was merged and conflicts occurred during merge
2269 .It ! Ta changes destined for a missing file were not merged
2270 .It D Ta file was deleted
2271 .It d Ta file's deletion was prevented by local modifications
2272 .It A Ta new file was added
2273 .It \(a~ Ta changes destined for a non-regular file were not merged
2274 .It ? Ta changes destined for an unversioned file were not merged
2277 If merge conflicts occur, the rebase operation is interrupted and may
2278 be continued once conflicts have been resolved.
2279 If any files with destined changes are found to be missing or unversioned,
2280 or if files could not be deleted due to differences in deleted content,
2281 the rebase operation will be interrupted to prevent potentially incomplete
2282 changes from being committed to the repository without user intervention.
2283 The work tree may be modified as desired and the rebase operation can be
2284 continued once the changes present in the work tree are considered complete.
2285 Alternatively, the rebase operation may be aborted which will leave
2287 unmodified and the work tree switched back to its original branch.
2289 If a merge conflict is resolved in a way which renders the merged
2290 change into a no-op change, the corresponding commit will be elided
2291 when the rebase operation continues.
2294 will refuse to run if certain preconditions are not met.
2299 reference namespace, the branch may not be rebased.
2300 If the work tree is not yet fully updated to the tip commit of its
2301 branch, then the work tree must first be updated with
2303 If changes have been staged with
2305 these changes must first be committed with
2309 If the work tree contains local changes, these changes must first be
2316 contains changes to files outside of the work tree's path prefix,
2317 the work tree cannot be used to rebase this branch.
2326 commands will refuse to run while a rebase operation is in progress.
2327 Other commands which manipulate the work tree may be used for
2328 conflict resolution purposes.
2332 is already based on the work tree's current branch, then no commits
2333 need to be rebased and
2335 will simply switch the work tree to the specified
2337 and update files in the work tree accordingly.
2344 Abort an interrupted rebase operation.
2345 If this option is used, no other command-line arguments are allowed.
2347 Continue an interrupted rebase operation.
2348 If this option is used, no other command-line arguments are allowed.
2350 Show a list of past rebase operations, represented by references in the
2351 .Dq refs/got/backup/rebase
2352 reference namespace.
2354 Display the author, date, and log message of each backed up commit,
2355 the object ID of the corresponding post-rebase commit, and
2356 the object ID of their common ancestor commit.
2357 Given these object IDs,
2364 options can be used to examine the history of either version of the branch,
2369 option can be used to create a new branch from a pre-rebase state if desired.
2373 is specified, only show commits which at some point in time represented this
2375 Otherwise, list all backed up commits for any branches.
2377 If this option is used,
2379 does not require a work tree.
2380 None of the other options can be used together with
2383 Delete backups created by past rebase operations, represented by references
2385 .Dq refs/got/backup/rebase
2386 reference namespace.
2390 is specified, only delete backups which at some point in time represented
2392 Otherwise, delete all references found within
2393 .Dq refs/got/backup/rebase .
2395 Any commit, tree, tag, and blob objects belonging to deleted backups
2396 remain in the repository and may be removed separately with
2397 Git's garbage collector or
2398 .Cm gotadmin cleanup .
2400 If this option is used,
2402 does not require a work tree.
2403 None of the other options can be used together with
2410 .Op Fl F Ar histedit-script
2414 Edit commit history between the work tree's current base commit and
2415 the tip commit of the work tree's current branch.
2419 command requires the
2421 environment variable to be set,
2422 unless an author has been configured in
2428 configuration settings can be obtained from the repository's
2430 file or from Git's global
2436 operation, the work tree's current branch must be set with
2438 to the branch which should be edited, unless this branch is already the
2439 current branch of the work tree.
2440 The tip of this branch represents the upper bound (inclusive) of commits
2445 Furthermore, the work tree's base commit
2448 to a point in this branch's commit history where editing should begin.
2449 This commit represents the lower bound (non-inclusive) of commits touched
2454 Editing of commit history is controlled via a
2456 which can be written in an editor based on a template, passed on the
2457 command line, or generated with the
2463 The format of the histedit script is line-based.
2464 Each line in the script begins with a command name, followed by
2465 whitespace and an argument.
2466 For most commands, the expected argument is a commit ID SHA1 hash.
2467 Any remaining text on the line is ignored.
2468 Lines which begin with the
2470 character are ignored entirely.
2472 The available histedit script commands are as follows:
2473 .Bl -column YXZ pick-commit
2474 .It Cm pick Ar commit Ta Use the specified commit as it is.
2475 .It Cm edit Ar commit Ta Use the specified commit but once changes have been
2476 merged into the work tree interrupt the histedit operation for amending.
2477 .It Cm fold Ar commit Ta Combine the specified commit with the next commit
2478 listed further below that will be used.
2479 .It Cm drop Ar commit Ta Remove this commit from the edited history.
2480 .It Cm mesg Oo Ar log-message Oc Ta Create a new log message for the commit of
2485 command on the previous line of the histedit script.
2488 argument provides a new single-line log message to use.
2491 argument is omitted, open an editor where a new log message can be written.
2494 Every commit in the history being edited must be mentioned in the script.
2495 Lines may be re-ordered to change the order of commits in the edited history.
2496 No commit may be listed more than once.
2498 Edited commits are accumulated on a temporary branch which the work tree
2499 will remain switched to throughout the entire histedit operation.
2500 Once history editing has completed successfully, the temporary branch becomes
2501 the new version of the work tree's branch and the work tree is automatically
2504 Old commits in their pre-histedit state are automatically backed up in the
2505 .Dq refs/got/backup/histedit
2506 reference namespace.
2507 As long as these references are not removed older versions of edited
2508 commits will remain in the repository and can be viewed with the
2511 Removal of these references makes objects which become unreachable via
2512 any reference subject to removal by Git's garbage collector or
2513 .Cm gotadmin cleanup .
2515 While merging commits, show the status of each affected file,
2516 using the following status codes:
2517 .Bl -column YXZ description
2518 .It G Ta file was merged
2519 .It C Ta file was merged and conflicts occurred during merge
2520 .It ! Ta changes destined for a missing file were not merged
2521 .It D Ta file was deleted
2522 .It d Ta file's deletion was prevented by local modifications
2523 .It A Ta new file was added
2524 .It \(a~ Ta changes destined for a non-regular file were not merged
2525 .It ? Ta changes destined for an unversioned file were not merged
2528 If merge conflicts occur, the histedit operation is interrupted and may
2529 be continued once conflicts have been resolved.
2530 If any files with destined changes are found to be missing or unversioned,
2531 or if files could not be deleted due to differences in deleted content,
2532 the histedit operation will be interrupted to prevent potentially incomplete
2533 changes from being committed to the repository without user intervention.
2534 The work tree may be modified as desired and the histedit operation can be
2535 continued once the changes present in the work tree are considered complete.
2536 Alternatively, the histedit operation may be aborted which will leave
2537 the work tree switched back to its original branch.
2539 If a merge conflict is resolved in a way which renders the merged
2540 change into a no-op change, the corresponding commit will be elided
2541 when the histedit operation continues.
2544 will refuse to run if certain preconditions are not met.
2545 If the work tree's current branch is not in the
2547 reference namespace, the history of the branch may not be edited.
2548 If the work tree contains multiple base commits, it must first be updated
2549 to a single base commit with
2551 If changes have been staged with
2553 these changes must first be committed with
2557 If the work tree contains local changes, these changes must first be
2562 If the edited history contains changes to files outside of the work tree's
2563 path prefix, the work tree cannot be used to edit the history of this branch.
2571 commands will refuse to run while a histedit operation is in progress.
2572 Other commands which manipulate the work tree may be used, and the
2574 command may be used to commit arbitrary changes to the temporary branch
2575 while the histedit operation is interrupted.
2582 Abort an interrupted histedit operation.
2583 If this option is used, no other command-line arguments are allowed.
2585 Continue an interrupted histedit operation.
2586 If this option is used, no other command-line arguments are allowed.
2589 This option is a quick equivalent to a histedit script which drops all
2593 option can only be used when starting a new histedit operation.
2594 If this option is used, no other command-line arguments are allowed.
2596 Interrupt the histedit operation for editing after merging each commit.
2597 This option is a quick equivalent to a histedit script which uses the
2599 command for all commits.
2602 option can only be used when starting a new histedit operation.
2603 If this option is used, no other command-line arguments are allowed.
2604 .It Fl F Ar histedit-script
2607 instead of opening a temporary file in an editor where a histedit script
2610 Fold all commits into a single commit.
2611 This option is a quick equivalent to a histedit script which folds all
2612 commits, combining them all into one commit.
2615 option can only be used when starting a new histedit operation.
2616 If this option is used, no other command-line arguments are allowed.
2618 Show a list of past histedit operations, represented by references in the
2619 .Dq refs/got/backup/histedit
2620 reference namespace.
2622 Display the author, date, and log message of each backed up commit,
2623 the object ID of the corresponding post-histedit commit, and
2624 the object ID of their common ancestor commit.
2625 Given these object IDs,
2632 options can be used to examine the history of either version of the branch,
2637 option can be used to create a new branch from a pre-histedit state if desired.
2641 is specified, only show commits which at some point in time represented this
2643 Otherwise, list all backed up commits for any branches.
2645 If this option is used,
2647 does not require a work tree.
2648 None of the other options can be used together with
2651 Edit log messages only.
2652 This option is a quick equivalent to a histedit script which edits
2653 only log messages but otherwise leaves every picked commit as-is.
2656 option can only be used when starting a new histedit operation.
2657 If this option is used, no other command-line arguments are allowed.
2659 Delete backups created by past histedit operations, represented by references
2661 .Dq refs/got/backup/histedit
2662 reference namespace.
2666 is specified, only delete backups which at some point in time represented
2668 Otherwise, delete all references found within
2669 .Dq refs/got/backup/histedit .
2671 Any commit, tree, tag, and blob objects belonging to deleted backups
2672 remain in the repository and may be removed separately with
2673 Git's garbage collector or
2674 .Cm gotadmin cleanup .
2676 If this option is used,
2678 does not require a work tree.
2679 None of the other options can be used together with
2683 .It Cm integrate Ar branch
2685 Integrate the specified
2687 into the work tree's current branch.
2688 Files in the work tree are updated to match the contents on the integrated
2690 and the reference of the work tree's branch is changed to point at the
2691 head commit of the integrated
2694 Both branches can be considered equivalent after integration since they
2695 will be pointing at the same commit.
2696 Both branches remain available for future work, if desired.
2697 In case the integrated
2699 is no longer needed it may be deleted with
2702 Show the status of each affected file, using the following status codes:
2703 .Bl -column YXZ description
2704 .It U Ta file was updated
2705 .It D Ta file was deleted
2706 .It A Ta new file was added
2707 .It \(a~ Ta versioned file is obstructed by a non-regular file
2708 .It ! Ta a missing versioned file was restored
2712 will refuse to run if certain preconditions are not met.
2713 Most importantly, the
2715 must have been rebased onto the work tree's current branch with
2717 before it can be integrated, in order to linearize commit history and
2718 resolve merge conflicts.
2719 If the work tree contains multiple base commits, it must first be updated
2720 to a single base commit with
2722 If changes have been staged with
2724 these changes must first be committed with
2728 If the work tree contains local changes, these changes must first be
2740 Create a merge commit based on the current branch of the work tree and
2743 If a linear project history is desired, then use of
2745 should be preferred over
2747 However, even strictly linear projects may require merge commits in order
2748 to merge in new versions of third-party code stored on vendor branches
2752 Merge commits are commits based on multiple parent commits.
2753 The tip commit of the work tree's current branch, which must be set with
2757 operation, will be used as the first parent.
2758 The tip commit of the specified
2760 will be used as the second parent.
2762 No ancestral relationship between the two branches is required.
2763 If the two branches have already been merged previously, only new changes
2766 It is not possible to create merge commits with more than two parents.
2767 If more than one branch needs to be merged, then multiple merge commits
2768 with two parents each can be created in sequence.
2770 While merging changes found on the
2772 into the work tree, show the status of each affected file,
2773 using the following status codes:
2774 .Bl -column YXZ description
2775 .It G Ta file was merged
2776 .It C Ta file was merged and conflicts occurred during merge
2777 .It ! Ta changes destined for a missing file were not merged
2778 .It D Ta file was deleted
2779 .It d Ta file's deletion was prevented by local modifications
2780 .It A Ta new file was added
2781 .It \(a~ Ta changes destined for a non-regular file were not merged
2782 .It ? Ta changes destined for an unversioned file were not merged
2785 If merge conflicts occur, the merge operation is interrupted and conflicts
2786 must be resolved before the merge operation can continue.
2787 If any files with destined changes are found to be missing or unversioned,
2788 or if files could not be deleted due to differences in deleted content,
2789 the merge operation will be interrupted to prevent potentially incomplete
2790 changes from being committed to the repository without user intervention.
2791 The work tree may be modified as desired and the merge can be continued
2792 once the changes present in the work tree are considered complete.
2793 Alternatively, the merge operation may be aborted which will leave
2794 the work tree's current branch unmodified.
2796 If a merge conflict is resolved in a way which renders all merged
2797 changes into no-op changes, the merge operation cannot continue
2798 and must be aborted.
2801 will refuse to run if certain preconditions are not met.
2804 is based on the work tree's current branch, then no merge commit can
2807 may be used to integrate the
2810 If the work tree is not yet fully updated to the tip commit of its
2811 branch, then the work tree must first be updated with
2813 If the work tree contains multiple base commits, it must first be updated
2814 to a single base commit with
2816 If changes have been staged with
2818 these changes must first be committed with
2822 If the work tree contains local changes, these changes must first be
2829 contains changes to files outside of the work tree's path prefix,
2830 the work tree cannot be used to merge this branch.
2840 commands will refuse to run while a merge operation is in progress.
2841 Other commands which manipulate the work tree may be used for
2842 conflict resolution purposes.
2849 Abort an interrupted merge operation.
2850 If this option is used, no other command-line arguments are allowed.
2852 Continue an interrupted merge operation.
2853 If this option is used, no other command-line arguments are allowed.
2855 Merge changes into the work tree as usual but do not create a merge
2857 The merge result can be adjusted as desired before a merge commit is
2860 Alternatively, the merge may be aborted with
2867 .Op Fl F Ar response-script
2871 Stage local changes for inclusion in the next commit.
2874 is specified, stage all changes in the work tree.
2875 Otherwise, stage changes at or within the specified paths.
2876 Paths may be staged if they are added, modified, or deleted according to
2879 Show the status of each affected file, using the following status codes:
2880 .Bl -column YXZ description
2881 .It A Ta file addition has been staged
2882 .It M Ta file modification has been staged
2883 .It D Ta file deletion has been staged
2886 Staged file contents are saved in newly created blob objects in the repository.
2887 These blobs will be referred to by tree objects once staged changes have been
2890 Staged changes affect the behaviour of
2895 While paths with staged changes exist, the
2897 command will refuse to commit any paths which do not have staged changes.
2898 Local changes created on top of staged changes can only be committed if
2899 the path is staged again, or if the staged changes are committed first.
2902 command will show both local changes and staged changes.
2905 command is able to display local changes relative to staged changes,
2906 and to display staged changes relative to the repository.
2909 command cannot revert staged changes but may be used to revert
2910 local changes created on top of staged changes.
2916 .It Fl F Ar response-script
2924 responses line-by-line from the specified
2926 file instead of prompting interactively.
2928 Instead of staging new changes, list paths which are already staged,
2929 along with the IDs of staged blob objects and stage status codes.
2930 If paths were provided on the command line, show the staged paths
2931 among the specified paths.
2932 Otherwise, show all staged paths.
2934 Instead of staging the entire content of a changed file, interactively
2935 select or reject changes for staging based on
2939 (reject change), and
2941 (quit staging this file) responses.
2942 If a file is in modified status, individual patches derived from the
2943 modified file content can be staged.
2944 Files in added or deleted status may only be staged or rejected in
2947 Allow staging of symbolic links which point outside of the path space
2948 that is under version control.
2951 will reject such symbolic links due to safety concerns.
2954 may decide to represent such a symbolic link as a regular file which contains
2955 the link's target path, rather than creating an actual symbolic link which
2956 points outside of the work tree.
2957 Use of this option is discouraged because external mechanisms such as
2959 are better suited for managing symbolic links to paths not under
2964 will refuse to run if certain preconditions are not met.
2965 If a file contains merge conflicts, these conflicts must be resolved first.
2966 If a file is found to be out of date relative to the head commit on the
2967 work tree's current branch, the file must be updated with
2969 before it can be staged (however, this does not prevent the file from
2970 becoming out-of-date at some point after having been staged).
2977 commands will refuse to run while staged changes exist.
2978 If staged changes cannot be committed because a staged path
2979 is out of date, the path must be unstaged with
2981 before it can be updated with
2983 and may then be staged again if necessary.
2988 .Op Fl F Ar response-script
2992 Merge staged changes back into the work tree and put affected paths
2993 back into non-staged status.
2996 is specified, unstage all staged changes across the entire work tree.
2997 Otherwise, unstage changes at or within the specified paths.
2999 Show the status of each affected file, using the following status codes:
3000 .Bl -column YXZ description
3001 .It G Ta file was unstaged
3002 .It C Ta file was unstaged and conflicts occurred during merge
3003 .It ! Ta changes destined for a missing file were not merged
3004 .It D Ta file was staged as deleted and still is deleted
3005 .It d Ta file's deletion was prevented by local modifications
3006 .It \(a~ Ta changes destined for a non-regular file were not merged
3013 .It Fl F Ar response-script
3021 responses line-by-line from the specified
3023 file instead of prompting interactively.
3025 Instead of unstaging the entire content of a changed file, interactively
3026 select or reject changes for unstaging based on
3030 (keep change staged), and
3032 (quit unstaging this file) responses.
3033 If a file is staged in modified status, individual patches derived from the
3034 staged file content can be unstaged.
3035 Files staged in added or deleted status may only be unstaged in their entirety.
3041 .Op Fl r Ar repository-path
3044 Parse and print contents of objects to standard output in a line-based
3046 Content of commit, tree, and tag objects is printed in a way similar
3047 to the actual content stored in such objects.
3048 Blob object contents are printed as they would appear in files on disk.
3050 Attempt to interpret each argument as a reference, a tag name, or
3051 an object ID SHA1 hash.
3052 References will be resolved to an object ID.
3053 Tag names will resolved to a tag object.
3054 An abbreviated hash argument will be expanded to a full SHA1 hash
3055 automatically, provided the abbreviation is unique.
3057 If none of the above interpretations produce a valid result, or if the
3059 option is used, attempt to interpret the argument as a path which will
3060 be resolved to the ID of an object found at this path in the repository.
3067 Look up paths in the specified
3069 If this option is not used, paths are looked up in the commit resolved
3070 via the repository's HEAD reference.
3071 The expected argument is a commit ID SHA1 hash or an existing reference
3072 or tag name which will be resolved to a commit ID.
3073 An abbreviated hash argument will be expanded to a full SHA1 hash
3074 automatically, provided the abbreviation is unique.
3076 Interpret all arguments as paths only.
3077 This option can be used to resolve ambiguity in cases where paths
3078 look like tag names, reference names, or object IDs.
3079 .It Fl r Ar repository-path
3080 Use the repository at the specified path.
3081 If not specified, assume the repository is located at or above the current
3083 If this directory is a
3085 work tree, use the repository path associated with this work tree.
3087 .It Cm info Op Ar path ...
3088 Display meta-data stored in a work tree.
3093 The work tree to use is resolved implicitly by walking upwards from the
3094 current working directory.
3098 arguments are specified, show additional per-file information for tracked
3099 files located at or within these paths.
3102 argument corresponds to the work tree's root directory, display information
3103 for all tracked files.
3106 .Bl -tag -width GOT_IGNORE_GITCONFIG
3108 The author's name and email address, such as
3109 .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
3119 may fail to parse commits without an email address in author data,
3123 environment variables with a missing email address.
3125 .Ev GOT_AUTHOR will be overridden by configuration settings in
3131 configuration settings in the repository's
3138 configuration settings contained in Git's global
3140 configuration file will only be used if neither
3144 environment variable provide author information.
3145 .It Ev GOT_IGNORE_GITCONFIG
3146 If this variable is set then any remote repository definitions or author
3147 information found in Git configuration files will be ignored.
3148 .It Ev GOT_LOG_DEFAULT_LIMIT
3149 The default limit on the number of commits traversed by
3151 If set to zero, the limit is unbounded.
3152 This variable will be silently ignored if it is set to a non-numeric value.
3153 .It Ev VISUAL , EDITOR
3154 The editor spawned by
3162 text editor will be spawned in order to give
3164 the attention it deserves.
3167 .Bl -tag -width packed-refs -compact
3169 Repository-wide configuration settings for
3173 configuration file located in the root directory of a Git repository
3174 supersedes any relevant settings in Git's
3178 .It Pa .got/got.conf
3179 Worktree-specific configuration settings for
3183 configuration file in the
3185 meta-data directory of a work tree supersedes any relevant settings in
3188 configuration file and Git's
3195 Enable tab-completion of
3200 .Dl $ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
3202 Clone an existing Git repository for use with
3206 .Dl $ got clone ssh://git@github.com/openbsd/src.git
3208 Use of HTTP URLs currently requires
3212 .Dl $ git clone --bare https://github.com/openbsd/src.git
3214 Alternatively, for quick and dirty local testing of
3216 a new Git repository could be created and populated with files,
3217 e.g. from a temporary CVS checkout located at
3220 .Dl $ gotadmin init /var/git/src.git
3221 .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
3223 Check out a work tree from the Git repository to /usr/src:
3225 .Dl $ got checkout /var/git/src.git /usr/src
3227 View local changes in a work tree directory:
3229 .Dl $ got diff | less
3231 In a work tree, display files in a potentially problematic state:
3233 .Dl $ got status -s 'C!~?'
3235 Interactively revert selected local changes in a work tree directory:
3237 .Dl $ got revert -p -R\ .
3239 In a work tree or a git repository directory, list all branch references:
3243 As above, but list the most recently modified branches only:
3245 .Dl $ got branch -lt | head
3247 In a work tree or a git repository directory, create a new branch called
3248 .Dq unified-buffer-cache
3249 which is forked off the
3253 .Dl $ got branch -c master unified-buffer-cache
3255 Switch an existing work tree to the branch
3256 .Dq unified-buffer-cache .
3257 Local changes in the work tree will be preserved and merged if necessary:
3259 .Dl $ got update -b unified-buffer-cache
3261 Create a new commit from local changes in a work tree directory.
3262 This new commit will become the head commit of the work tree's current branch:
3266 In a work tree or a git repository directory, view changes committed in
3267 the 3 most recent commits to the work tree's branch, or the branch resolved
3268 via the repository's HEAD reference, respectively:
3270 .Dl $ got log -p -l 3
3272 As above, but display changes in the order in which
3274 could apply them in sequence:
3276 .Dl $ got log -p -l 3 -R
3278 In a work tree or a git repository directory, log the history of a subdirectory:
3280 .Dl $ got log sys/uvm
3282 While operating inside a work tree, paths are specified relative to the current
3283 working directory, so this command will log the subdirectory
3286 .Dl $ cd sys/uvm && got log\ .
3288 And this command has the same effect:
3290 .Dl $ cd sys/dev/usb && got log ../../uvm
3292 And this command displays work tree meta-data about all tracked files:
3295 .Dl $ got info\ . | less
3297 Add new files and remove obsolete files in a work tree directory:
3299 .Dl $ got add sys/uvm/uvm_ubc.c
3300 .Dl $ got remove sys/uvm/uvm_vnode.c
3302 Create a new commit from local changes in a work tree directory
3303 with a pre-defined log message.
3305 .Dl $ got commit -m 'unify the buffer cache'
3307 Alternatively, create a new commit from local changes in a work tree
3308 directory with a log message that has been prepared in the file
3311 .Dl $ got commit -F /tmp/msg
3313 Update any work tree checked out from the
3314 .Dq unified-buffer-cache
3315 branch to the latest commit on this branch:
3319 Roll file content on the unified-buffer-cache branch back by one commit,
3320 and then fetch the rolled-back change into the work tree as a local change
3321 to be amended and perhaps committed again:
3323 .Dl $ got backout unified-buffer-cache
3324 .Dl $ got commit -m 'roll back previous'
3325 .Dl $ # now back out the previous backout :-)
3326 .Dl $ got backout unified-buffer-cache
3328 Fetch new changes on the remote repository's
3330 branch, making them visible on the local repository's
3337 In a repository created with a HTTP URL and
3338 .Cm git clone --bare
3341 command must be used instead:
3343 .Dl $ cd /var/git/src.git
3344 .Dl $ git fetch origin master:refs/remotes/origin/master
3348 branch to merge the new changes that are now visible on the
3353 .Dl $ got update -b origin/master
3354 .Dl $ got rebase master
3357 .Dq unified-buffer-cache
3358 branch on top of the new head commit of the
3362 .Dl $ got update -b master
3363 .Dl $ got rebase unified-buffer-cache
3365 Create a patch from all changes on the unified-buffer-cache branch.
3366 The patch can be mailed out for review and applied to
3370 .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
3372 Edit the entire commit history of the
3373 .Dq unified-buffer-cache
3376 .Dl $ got update -b unified-buffer-cache
3377 .Dl $ got update -c master
3380 Before working against existing branches in a repository cloned with
3381 .Cm git clone --bare
3386 must be configured to map all references in the remote repository
3389 namespace of the local repository.
3390 This can be achieved by setting Git's
3391 .Pa remote.origin.fetch
3392 configuration variable to the value
3393 .Dq +refs/heads/*:refs/remotes/origin/*
3398 .Dl $ cd /var/git/repo
3399 .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
3403 option must be disabled:
3405 .Dl $ cd /var/git/repo
3406 .Dl $ git config remote.origin.mirror false
3408 Alternatively, the following
3410 configuration item can be added manually to the Git repository's
3414 .Dl [remote \&"origin\&"]
3416 .Dl fetch = +refs/heads/*:refs/remotes/origin/*
3419 This configuration leaves the local repository's
3421 namespace free for use by local branches checked out with
3423 and, if needed, created with
3426 .Dq refs/remotes/origin
3427 namespace can now be updated with incoming changes from the remote
3432 without extra command line arguments.
3433 Newly fetched changes can be examined with
3436 Display changes on the remote repository's version of the
3438 branch, as of the last time
3442 .Dl $ got log -c origin/master | less
3444 As shown here, most commands accept abbreviated reference names such as
3447 .Dq refs/remotes/origin/master .
3448 The latter is only needed in case of ambiguity.
3451 must be used to merge changes which are visible on the
3456 This will also merge local changes, if any, with the incoming changes:
3458 .Dl $ got update -b origin/master
3459 .Dl $ got rebase master
3461 In order to make changes committed to the
3462 .Dq unified-buffer-cache
3466 .Dq unified-buffer-cache
3467 branch must first be rebased onto the
3471 .Dl $ got update -b master
3472 .Dl $ got rebase unified-buffer-cache
3475 .Dq unified-buffer-cache
3476 branch can now be made visible on the
3480 Because the rebase operation switched the work tree to the
3481 .Dq unified-buffer-cache
3482 branch, the work tree must be switched back to the
3486 .Dl $ got update -b master
3487 .Dl $ got integrate unified-buffer-cache
3491 branch, log messages for local changes can now be amended with
3493 by other developers and any other important new information:
3495 .Dl $ got update -c origin/master
3496 .Dl $ got histedit -m
3498 If the remote repository offers write access, local changes on the
3500 branch can be sent to the remote repository with
3504 can be run without further arguments.
3505 The arguments shown here match defaults, provided the work tree's
3506 current branch is the
3510 .Dl $ got send -b master origin
3512 If the remote repository requires the HTTPS protocol, the
3514 command must be used instead:
3516 .Dl $ cd /var/git/src.git
3517 .Dl $ git push origin master
3519 When making contributions to projects which use the
3521 workflow, SSH protocol repository access needs to be set up first.
3522 Once an account has been created on a Git hosting site it should
3523 be possible to upload a public SSH key for repository access
3528 workflow will usually involve two remote repositories.
3529 In the real-life example below, the
3531 repository was forked from the
3533 repository by using the Git hosting site's web interface.
3536 file in the local repository describes both remote repositories:
3537 .Bd -literal -offset indent
3538 # Jelmers's repository, which accepts pull requests
3540 server git@github.com
3542 repository "/jelmer/dulwich"
3546 # Stefan's fork, used as the default remote repository
3548 server git@github.com
3550 repository "/stspdotname/dulwich"
3555 With this configuration, Stefan can create commits on
3556 .Dq refs/heads/master
3557 and send them to the
3559 repository by running:
3561 .Dl $ got send -b master origin
3563 The changes can now be proposed to Jelmer by opening a pull request
3564 via the Git hosting site's web interface.
3565 If Jelmer requests further changes to be made, additional commits
3566 can be created on the
3568 branch and be added to the pull request by running
3572 If Jelmer prefers additional commits to be
3574 then the following commands can be used to achieve this:
3576 .Dl $ got update -b master
3577 .Dl $ got update -c origin/master
3578 .Dl $ got histedit -f
3579 .Dl $ got send -f -b master origin
3581 Once Jelmer has accepted the pull request, Stefan can fetch the
3582 merged changes, and possibly several other new changes, by running:
3584 .Dl $ got fetch upstream
3586 The merged changes will now be visible under the reference
3587 .Dq refs/remotes/upstream/master .
3590 branch can now be rebased on top of the latest changes
3593 .Dl $ got update -b upstream/master
3594 .Dl $ got rebase master
3596 As a final step, the forked repository's copy of the master branch needs
3597 to be kept in sync by sending the new changes there:
3599 .Dl $ got send -f -b master origin
3601 If multiple pull requests need to be managed in parallel, a separate branch
3602 must be created for each pull request with
3604 Each such branch can then be used as above, in place of
3605 .Dq refs/heads/master .
3606 Changes for any accepted pull requests will still appear under
3607 .Dq refs/remotes/upstream/master,
3608 regardless of which branch was used in the forked repository to
3609 create a pull request.
3613 .Xr git-repository 5 ,
3614 .Xr got-worktree 5 ,
3618 .An Anthony J. Bentley Aq Mt bentley@openbsd.org
3619 .An Christian Weisgerber Aq Mt naddy@openbsd.org
3620 .An Hiltjo Posthuma Aq Mt hiltjo@codemadness.org
3621 .An Josh Rickmar Aq Mt jrick@zettaport.com
3622 .An Joshua Stein Aq Mt jcs@openbsd.org
3623 .An Klemens Nanni Aq Mt kn@openbsd.org
3624 .An Martin Pieuchot Aq Mt mpi@openbsd.org
3625 .An Neels Hofmeyr Aq Mt neels@hofmeyr.de
3626 .An Omar Polo Aq Mt op@openbsd.org
3627 .An Ori Bernstein Aq Mt ori@openbsd.org
3628 .An Sebastien Marie Aq Mt semarie@openbsd.org
3629 .An Stefan Sperling Aq Mt stsp@openbsd.org
3630 .An Steven McDonald Aq Mt steven@steven-mcdonald.id.au
3631 .An Theo Buehler Aq Mt tb@openbsd.org
3632 .An Thomas Adam Aq Mt thomas@xteddy.org
3633 .An Tracey Emery Aq Mt tracey@traceyemery.net
3634 .An Yang Zhong Aq Mt yzhong@freebsdfoundation.org
3641 were derived from code under copyright by:
3643 .An Caldera International
3644 .An Daniel Hartmeier
3649 .An Jean-Francois Brousseau
3655 .An Niklas Hallqvist
3660 .An Xavier Santolaria
3663 contains code contributed to the public domain by
3664 .An Austin Appleby .
3667 is a work-in-progress and some features remain to be implemented.
3669 At present, the user has to fall back on
3671 to perform some tasks.
3675 Reading from remote repositories over HTTP or HTTPS protocols requires
3680 Writing to remote repositories over HTTP or HTTPS protocols requires
3683 The creation of merge commits with more than two parent commits requires
3686 In situations where files or directories were moved around
3688 will not automatically merge changes to new locations and
3690 will usually produce better results.
