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, the work tree's current branch
387 will be fetched if invoked within a work tree,
388 otherwise a branch resolved via the remote repository's HEAD reference
390 Cannot be used together with the
396 from the remote repository's
399 This option may be specified multiple times to build a list of branches
401 If this option is not specified, the work tree's current branch
402 will be fetched if invoked within a work tree,
403 otherwise a branch resolved via the remote repository's HEAD reference
405 Cannot be used together with the
409 Delete branches and tags from the local repository which are no longer
410 present in the remote repository.
411 Only references are deleted.
412 Any commit, tree, tag, and blob objects belonging to deleted branches or
413 tags remain in the repository and may be removed separately with
414 Git's garbage collector or
415 .Cm gotadmin cleanup .
417 List branches and tags available for fetching from the remote repository
418 and exit immediately.
419 Cannot be used together with any of the other options except
425 Suppress progress reporting output.
426 The same option will be passed to
429 .It Fl R Ar reference
430 In addition to the branches and tags that will be fetched, fetch an arbitrary
432 from the remote repository's
435 This option may be specified multiple times to build a list of additional
439 may either be a path to a specific reference, or a reference namespace
440 which will cause all references in this namespace to be fetched.
442 Each reference will be mapped into the local repository's
444 namespace, unless the local repository was created as a mirror with
446 in which case references will be mapped directly into the local repository's
450 Once a reference has been fetched, a branch based on it can be created with
455 will refuse to fetch references from the remote repository's
460 .It Fl r Ar repository-path
461 Use the repository at the specified path.
462 If not specified, assume the repository is located at or above the current
464 If this directory is a
466 work tree, use the repository path associated with this work tree.
468 Allow existing references in the
470 namespace to be updated if they have changed on the server.
471 If not specified, only new tag references will be created.
476 to print debugging messages to standard error output.
477 The same option will be passed to
480 Multiple -v options increase the verbosity.
483 Delete all references which correspond to a particular
484 .Ar remote-repository
485 instead of fetching new changes.
486 This can be useful when a remote repository is being removed from
492 .Ar remote-repository
493 argument is mandatory and no other options except
500 Only references are deleted.
501 Any commit, tree, tag, and blob objects fetched from a remote repository
502 will generally be stored in pack files and may be removed separately with
504 and Git's garbage collector.
512 .Op Fl p Ar path-prefix
514 .Op Ar work-tree-path
517 Copy files from a repository into a new work tree.
518 Show the status of each affected file, using the following status codes:
519 .Bl -column YXZ description
520 .It A Ta new file was added
521 .It E Ta file already exists in work tree's meta-data
526 is not specified, either use the last component of
527 .Ar repository path ,
530 was specified use the last component of
538 Check out files from a commit on the specified
540 If this option is not specified, a branch resolved via the repository's HEAD
541 reference will be used.
543 Check out files from the specified
545 on the selected branch.
546 The expected argument is a commit ID SHA1 hash or an existing reference
547 or tag name which will be resolved to a commit ID.
548 An abbreviated hash argument will be expanded to a full SHA1 hash
549 automatically, provided the abbreviation is unique.
550 If this option is not specified, the most recent commit on the selected
555 is not contained in the selected branch, a different branch which contains
556 this commit must be specified with the
559 If no such branch is known, a new branch must be created for this
565 Checking out work trees with an unknown branch is intentionally not supported.
567 Proceed with the checkout operation even if the directory at
570 Existing files will be left intact.
571 .It Fl p Ar path-prefix
572 Restrict the work tree to a subset of the repository's tree hierarchy.
573 Only files beneath the specified
577 Silence progress output.
588 Update an existing work tree to a different
590 Change existing files in the work tree as necessary to match file contents
592 Preserve any local changes in the work tree and merge them with the
595 Files which already contain merge conflicts will not be updated to avoid
596 further complications.
597 Such files will be updated when
599 is run again after merge conflicts have been resolved.
600 If the conflicting changes are no longer needed, affected files can be
607 Show the status of each affected file, using the following status codes:
608 .Bl -column YXZ description
609 .It U Ta file was updated and contained no local changes
610 .It G Ta file was updated and local changes were merged cleanly
611 .It C Ta file was updated and conflicts occurred during merge
612 .It D Ta file was deleted
613 .It A Ta new file was added
614 .It \(a~ Ta versioned file is obstructed by a non-regular file
615 .It ! Ta a missing versioned file was restored
616 .It # Ta file was not updated because it contains merge conflicts
617 .It ? Ta changes destined for an unversioned file were not merged
622 is specified, update the entire work tree.
623 Otherwise, restrict the update operation to files at or within the
625 Each path is required to exist in the update operation's target commit.
626 Files in the work tree outside specified paths will remain unchanged and
627 will retain their previously recorded base commit.
630 commands may refuse to run while the work tree contains files from
631 multiple base commits.
632 The base commit of such a work tree can be made consistent by running
634 across the entire work tree.
637 is incompatible with the
642 cannot update paths with staged changes.
643 If changes have been staged with
645 these changes must first be committed with
655 Switch the work tree's branch reference to the specified
657 before updating the work tree.
658 This option requires that all paths in the work tree are updated.
660 As usual, any local changes in the work tree will be preserved.
661 This can be useful when switching to a newly created branch in order
662 to commit existing local changes to this branch.
664 Any local changes must be dealt with separately in order to obtain a
665 work tree with pristine file contents corresponding exactly to the specified
667 Such changes could first be committed to a different branch with
669 or could be discarded with
672 Update the work tree to the specified
674 The expected argument is a commit ID SHA1 hash or an existing reference
675 or tag name which will be resolved to a commit ID.
676 An abbreviated hash argument will be expanded to a full SHA1 hash
677 automatically, provided the abbreviation is unique.
678 If this option is not specified, the most recent commit on the work tree's
681 Silence progress output.
687 .Op Fl S Ar status-codes
688 .Op Fl s Ar status-codes
692 Show the current modification status of files in a work tree,
693 using the following status codes:
694 .Bl -column YXZ description
695 .It M Ta modified file
696 .It A Ta file scheduled for addition in next commit
697 .It D Ta file scheduled for deletion in next commit
698 .It C Ta modified or added file which contains merge conflicts
699 .It ! Ta versioned file was expected on disk but is missing
700 .It \(a~ Ta versioned file is obstructed by a non-regular file
701 .It ? Ta unversioned item not tracked by
703 .It m Ta modified file modes (executable bit only)
704 .It N Ta non-existent
706 specified on the command line
711 is specified, show modifications in the entire work tree.
712 Otherwise, show modifications at or within the specified paths.
714 If changes have been staged with
716 staged changes are shown in the second output column, using the following
718 .Bl -column YXZ description
719 .It M Ta file modification is staged
720 .It A Ta file addition is staged
721 .It D Ta file deletion is staged
724 Changes created on top of staged changes are indicated in the first column:
725 .Bl -column YXZ description
726 .It MM Ta file was modified after earlier changes have been staged
727 .It MA Ta file was modified after having been staged for addition
735 Show unversioned files even if they match an ignore pattern.
736 .It Fl S Ar status-codes
737 Suppress the output of files with a modification status matching any of the
738 single-character status codes contained in the
741 Any combination of codes from the above list of possible status codes
743 For staged files, status codes displayed in either column will be matched.
744 Cannot be used together with the
747 .It Fl s Ar status-codes
748 Only show 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
760 For compatibility with
771 files in each traversed directory and will not display unversioned files
772 which match these patterns.
777 supports consecutive asterisks,
779 which will match an arbitrary amount of directories.
783 only supports a single ignore pattern per line.
787 does not support negated ignore patterns prefixed with
789 and gives no special significance to the location of path component separators,
798 .Op Fl r Ar repository-path
799 .Op Fl S Ar search-pattern
803 Display history of a repository.
806 is specified, show only commits which modified this path.
807 If invoked in a work tree, the
809 is interpreted relative to the current working directory,
810 and the work tree's path prefix is implicitly prepended.
811 Otherwise, the path is interpreted relative to the repository root.
818 Display individual commits which were merged into the current branch
822 shows the linear history of the current branch only.
824 Set the number of context lines shown in diffs with
826 By default, 3 lines of context are shown.
828 Start traversing history at the specified
830 The expected argument is a commit ID SHA1 hash or an existing reference
831 or tag name which will be resolved to a commit ID.
832 An abbreviated hash argument will be expanded to a full SHA1 hash
833 automatically, provided the abbreviation is unique.
834 If this option is not specified, default to the work tree's current branch
835 if invoked in a work tree, or to the repository's HEAD reference.
837 Display diffstat of changes introduced in each commit.
838 Cannot be used with the
842 Limit history traversal to a given number of commits.
843 If this option is not specified, a default limit value of zero is used,
844 which is treated as an unbounded limit.
846 .Ev GOT_LOG_DEFAULT_LIMIT
847 environment variable may be set to change this default value.
849 Display the list of file paths changed in each commit, using the following
851 .Bl -column YXZ description
852 .It M Ta modified file
853 .It D Ta file was deleted
854 .It A Ta new file was added
855 .It m Ta modified file modes (executable bit only)
858 Cannot be used with the
862 Display the patch of modifications made in each commit.
865 is specified, only show the patch of modifications at or within this path.
866 Cannot be used with the
870 Determine a set of commits to display as usual, but display these commits
872 .It Fl r Ar repository-path
873 Use the repository at the specified path.
874 If not specified, assume the repository is located at or above the current
876 If this directory is a
878 work tree, use the repository path associated with this work tree.
879 .It Fl S Ar search-pattern
880 If specified, show only commits with a log message, author name,
881 committer name, or ID SHA1 hash matched by the extended regular
884 Lines in committed patches will be matched if
887 File paths changed by a commit will be matched if
890 Regular expression syntax is documented in
893 Display a short one-line summary of each commit, instead of the default
895 Cannot be used together with the
901 Stop traversing commit history immediately after the specified
904 This option has no effect if the specified
914 .Op Fl r Ar repository-path
915 .Op Ar object1 Ar object2 | Ar path ...
918 When invoked within a work tree without any arguments, display all
919 local changes in the work tree.
922 arguments are specified, only show changes within the specified paths.
924 If two arguments are provided, treat each argument as a reference, a tag
925 name, or an object ID SHA1 hash, and display differences between the
926 corresponding objects.
927 Both objects must be of the same type (blobs, trees, or commits).
928 An abbreviated hash argument will be expanded to a full SHA1 hash
929 automatically, provided the abbreviation is unique.
930 If none of these interpretations produce a valid result or if the
935 is running in a work tree, attempt to interpret the two arguments as paths.
942 Treat file contents as ASCII text even if binary data is detected.
944 Set the number of context lines shown in the diff.
945 By default, 3 lines of context are shown.
947 Show differences between commits in the repository.
948 This option may be used up to two times.
949 When used only once, show differences between the specified
951 and its first parent commit.
952 When used twice, show differences between the two specified commits.
954 The expected argument is a commit ID SHA1 hash or an existing reference
955 or tag name which will be resolved to a commit ID.
956 An abbreviated hash argument will be expanded to a full SHA1 hash
957 automatically, provided the abbreviation is unique.
961 option is used, all non-option arguments will be interpreted as paths.
964 arguments are provided, only show differences for the specified paths.
966 Cannot be used together with the
970 Display diffstat of changes before the actual diff by annotating each file path
971 or blob hash being diffed with the total number of lines added and removed.
972 A summary line will display the total number of changes across all files.
974 Interpret all arguments as paths only.
975 This option can be used to resolve ambiguity in cases where paths
976 look like tag names, reference names, or object IDs.
977 This option is only valid when
979 is invoked in a work tree.
980 .It Fl r Ar repository-path
981 Use the repository at the specified path.
982 If not specified, assume the repository is located at or above the current
984 If this directory is a
986 work tree, use the repository path associated with this work tree.
988 Show changes staged with
990 instead of showing local changes in the work tree.
991 This option is only valid when
993 is invoked in a work tree.
995 Ignore whitespace-only changes.
1001 .Op Fl r Ar repository-path
1005 Display line-by-line history of a file at the specified path.
1012 Start traversing history at the specified
1014 The expected argument is a commit ID SHA1 hash or an existing reference
1015 or tag name which will be resolved to a commit ID.
1016 An abbreviated hash argument will be expanded to a full SHA1 hash
1017 automatically, provided the abbreviation is unique.
1018 .It Fl r Ar repository-path
1019 Use the repository at the specified path.
1020 If not specified, assume the repository is located at or above the current
1022 If this directory is a
1024 work tree, use the repository path associated with this work tree.
1031 .Op Fl r Ar repository-path
1035 Display a listing of files and directories at the specified
1036 directory path in the repository.
1037 Entries shown in this listing may carry one of the following trailing
1039 .Bl -column YXZ description
1040 .It @ Ta entry is a symbolic link
1041 .It / Ta entry is a directory
1042 .It * Ta entry is an executable file
1043 .It $ Ta entry is a Git submodule
1046 Symbolic link entries are also annotated with the target path of the link.
1050 is specified, list the repository path corresponding to the current
1051 directory of the work tree, or the root directory of the repository
1052 if there is no work tree.
1059 List files and directories as they appear in the specified
1061 The expected argument is a commit ID SHA1 hash or an existing reference
1062 or tag name which will be resolved to a commit ID.
1063 An abbreviated hash argument will be expanded to a full SHA1 hash
1064 automatically, provided the abbreviation is unique.
1066 Show object IDs of files (blob objects) and directories (tree objects).
1068 Recurse into sub-directories in the repository.
1069 .It Fl r Ar repository-path
1070 Use the repository at the specified path.
1071 If not specified, assume the repository is located at or above the current
1073 If this directory is a
1075 work tree, use the repository path associated with this work tree.
1081 .Op Fl r Ar repository-path
1082 .Op Fl s Ar reference
1085 Manage references in a repository.
1087 References may be listed, created, deleted, and changed.
1088 When creating, deleting, or changing a reference the specified
1090 must be an absolute reference name, i.e. it must begin with
1098 Create a reference or change an existing reference.
1099 The reference with the specified
1101 will point at the specified
1105 argument is a ID SHA1 hash or an existing reference or tag name which will
1106 be resolved to the ID of a corresponding commit, tree, tag, or blob object.
1107 Cannot be used together with any other options except
1110 Delete the reference with the specified
1112 from the repository.
1113 Any commit, tree, tag, and blob objects belonging to deleted references
1114 remain in the repository and may be removed separately with
1115 Git's garbage collector or
1116 .Cm gotadmin cleanup .
1117 Cannot be used together with any other options except
1120 List references in the repository.
1123 is specified, list all existing references in the repository.
1126 is a reference namespace, list all references in this namespace.
1127 Otherwise, show only the reference with the given
1129 Cannot be used together with any other options except
1133 .It Fl r Ar repository-path
1134 Use the repository at the specified path.
1135 If not specified, assume the repository is located at or above the current
1137 If this directory is a
1139 work tree, use the repository path associated with this work tree.
1140 .It Fl s Ar reference
1141 Create a symbolic reference, or change an existing symbolic reference.
1142 The symbolic reference with the specified
1144 will point at the specified
1146 which must already exist in the repository.
1147 Care should be taken not to create loops between references when
1148 this option is used.
1149 Cannot be used together with any other options except
1152 Sort listed references by modification time (most recently modified first)
1153 instead of sorting by lexicographical order.
1154 Use of this option requires the
1156 option to be used as well.
1164 .Op Fl r Ar repository-path
1168 Create, list, or delete branches.
1170 Local branches are managed via references which live in the
1172 reference namespace.
1175 command creates references in this namespace only.
1177 When deleting branches, the specified
1181 reference namespace first.
1182 If no corresponding branch is found, the
1184 namespace will be searched next.
1186 If invoked in a work tree without any arguments, print the name of the
1187 work tree's current branch.
1191 argument is passed, attempt to create a branch reference with the given name.
1192 By default the new branch reference will point at the latest commit on the
1193 work tree's current branch if invoked in a work tree, and otherwise to a commit
1194 resolved via the repository's HEAD reference.
1196 If invoked in a work tree, once the branch was created successfully
1197 switch the work tree's head reference to the newly created branch and
1198 update files across the entire work tree, just like
1199 .Cm got update -b Ar name
1201 Show the status of each affected file, using the following status codes:
1202 .Bl -column YXZ description
1203 .It U Ta file was updated and contained no local changes
1204 .It G Ta file was updated and local changes were merged cleanly
1205 .It C Ta file was updated and conflicts occurred during merge
1206 .It D Ta file was deleted
1207 .It A Ta new file was added
1208 .It \(a~ Ta versioned file is obstructed by a non-regular file
1209 .It ! Ta a missing versioned file was restored
1217 Make a newly created branch reference point at the specified
1221 argument is a commit ID SHA1 hash or an existing reference
1222 or tag name which will be resolved to a commit ID.
1224 Delete the branch with the specified
1230 reference namespace.
1232 Only the branch reference is deleted.
1233 Any commit, tree, and blob objects belonging to the branch
1234 remain in the repository and may be removed separately with
1235 Git's garbage collector or
1236 .Cm gotadmin cleanup .
1238 List all existing branches in the repository, including copies of remote
1239 repositories' branches in the
1241 reference namespace.
1243 If invoked in a work tree, the work tree's current branch is shown
1244 with one the following annotations:
1245 .Bl -column YXZ description
1246 .It * Ta work tree's base commit matches the branch tip
1247 .It \(a~ Ta work tree's base commit is out-of-date
1250 Do not switch and update the work tree after creating a new branch.
1251 .It Fl r Ar repository-path
1252 Use the repository at the specified path.
1253 If not specified, assume the repository is located at or above the current
1255 If this directory is a
1257 work tree, use the repository path associated with this work tree.
1259 Sort listed branches by modification time (most recently modified first)
1260 instead of sorting by lexicographical order.
1263 reference namespace are listed before branches in
1266 Use of this option requires the
1268 option to be used as well.
1275 .Op Fl r Ar repository-path
1276 .Op Fl s Ar signer-id
1279 Manage tags in a repository.
1281 Tags are managed via references which live in the
1283 reference namespace.
1286 command operates on references in this namespace only.
1287 References in this namespace point at tag objects which contain a pointer
1288 to another object, a tag message, as well as author and timestamp information.
1290 Attempt to create a tag with the given
1292 and make this tag point at the given
1294 If no commit is specified, default to the latest commit on the work tree's
1295 current branch if invoked in a work tree, and to a commit resolved via
1296 the repository's HEAD reference otherwise.
1303 Make the newly created tag reference point at the specified
1307 argument is a commit ID SHA1 hash or an existing reference or tag name which
1308 will be resolved to a commit ID.
1309 An abbreviated hash argument will be expanded to a full SHA1 hash
1310 automatically, provided the abbreviation is unique.
1312 List all existing tags in the repository instead of creating a new tag.
1315 argument is passed, show only the tag with the given
1318 Use the specified tag message when creating the new tag.
1323 opens a temporary file in an editor where a tag message can be written.
1324 .It Fl r Ar repository-path
1325 Use the repository at the specified path.
1326 If not specified, assume the repository is located at or above the current
1328 If this directory is a
1330 work tree, use the repository path associated with this work tree.
1331 .It Fl s Ar signer-id
1332 While creating a new tag, sign this tag with the identity given in
1335 For SSH-based signatures,
1337 is the path to a file which may refer to either a private SSH key,
1338 or a public SSH key with the private half available via
1341 will sign the tag object by invoking
1345 command, using the signature namespace
1347 for compatibility with
1350 Verify tag object signatures.
1353 is specified, show and verify the tag object with the provided name.
1354 Otherwise, list all tag objects and verify signatures where present.
1357 verifies SSH-based signatures by invoking
1360 .Fl Y Cm verify Fl f Ar allowed_signers .
1365 otherwise verification is impossible.
1368 During SSH signature creation and verification this option will be passed to
1370 Multiple -v options increase the verbosity.
1376 command will not delete tags or change existing tags.
1377 If a tag must be deleted, the
1379 command may be used to delete a tag's reference.
1380 This should only be done if the tag has not already been copied to
1387 Schedule unversioned files in a work tree for addition to the
1388 repository in the next commit.
1389 By default, files which match a
1391 ignore pattern will not be added.
1398 Add files even if they match a
1402 Permit recursion into directories.
1403 If this option is not specified,
1405 will refuse to run if a specified
1413 .Op Fl s Ar status-codes
1417 Remove versioned files from a work tree and schedule them for deletion
1418 from the repository in the next commit.
1425 Perform the operation even if a file contains local modifications,
1426 and do not raise an error if a specified
1428 does not exist on disk.
1430 Keep affected files on disk.
1432 Permit recursion into directories.
1433 If this option is not specified,
1435 will refuse to run if a specified
1438 .It Fl s Ar status-codes
1439 Only delete files with a modification status matching one of the
1440 single-character status codes contained in the
1443 The following status codes may be specified:
1444 .Bl -column YXZ description
1445 .It M Ta modified file (this implies the
1448 .It ! Ta versioned file expected on disk but missing
1456 .Op Fl p Ar strip-count
1462 to files in a work tree.
1463 Files added or removed by a patch will be scheduled for addition or removal in
1466 The patch must be in the unified diff format as produced by
1473 diff when invoked with their
1478 argument is provided, read unified diff data from standard input instead.
1482 contains multiple patches, then attempt to apply each of them in sequence.
1484 Show the status of each affected file, using the following status codes:
1485 .Bl -column XYZ description
1486 .It M Ta file was modified
1487 .It G Ta file was merged using a merge-base found in the repository
1488 .It C Ta file was merged and conflicts occurred during merge
1489 .It D Ta file was deleted
1490 .It A Ta file was added
1491 .It # Ta failed to patch the file
1494 If a change does not match at its exact line number, attempt to
1495 apply it somewhere else in the file if a good spot can be found.
1496 Otherwise, the patch will fail to apply.
1500 will refuse to apply a patch if certain preconditions are not met.
1501 Files to be deleted must already be under version control, and must
1502 not have been scheduled for deletion already.
1503 Files to be added must not yet be under version control and must not
1504 already be present on disk.
1505 Files to be modified must already be under version control and may not
1506 contain conflict markers.
1508 If an error occurs, the
1510 operation will be aborted.
1511 Any changes made to the work tree up to this point will be left behind.
1512 Such changes can be viewed with
1514 and can be reverted with
1523 Attempt to locate files within the specified
1525 for use as a merge-base for 3-way merges.
1526 Ideally, the specified
1528 should contain versions of files which the changes contained in the
1531 Files will be located by path, relative to the repository root.
1534 option is used then leading path components will be stripped
1535 before paths are looked up in the repository.
1539 option is not used then
1541 will attempt to locate merge-bases via object IDs found in
1543 meta-data, such as produced by
1549 option is only recommended in the absence of such meta-data.
1551 In case no merge-base is available for a file, changes will be applied
1552 without doing a 3-way merge.
1553 Changes which do not apply cleanly may then be rejected entirely, rather
1554 than producing merge conflicts in the patched target file.
1556 Do not make any modifications to the work tree.
1557 This can be used to check whether a patch would apply without issues.
1560 contains diffs that affect the same file multiple times, the results
1561 displayed may be incorrect.
1562 .It Fl p Ar strip-count
1563 Specify the number of leading path components to strip from paths
1572 path prefixes generated by
1574 will be recognized and stripped automatically.
1576 Reverse the patch before applying it.
1582 .Op Fl F Ar response-script
1586 Revert any local changes in files at the specified paths in a work tree.
1587 File contents will be overwritten with those contained in the
1588 work tree's base commit.
1589 There is no way to bring discarded changes back after
1592 If a file was added with
1594 it will become an unversioned file again.
1595 If a file was deleted with
1597 it will be restored.
1603 .It Fl F Ar response-script
1611 responses line-by-line from the specified
1613 file instead of prompting interactively.
1615 Instead of reverting all changes in files, interactively select or reject
1616 changes to revert based on
1622 (quit reverting this file) responses.
1623 If a file is in modified status, individual patches derived from the
1624 modified file content can be reverted.
1625 Files in added or deleted status may only be reverted in their entirety.
1627 Permit recursion into directories.
1628 If this option is not specified,
1630 will refuse to run if a specified
1644 Create a new commit in the repository from changes in a work tree
1645 and use this commit as the new base commit for the work tree.
1648 is specified, commit all changes in the work tree.
1649 Otherwise, commit changes at or within the specified paths.
1651 If changes have been explicitly staged for commit with
1653 only commit staged changes and reject any specified paths which
1654 have not been staged.
1657 opens a temporary file in an editor where a log message can be written
1665 options are used together.
1667 Show the status of each affected file, using the following status codes:
1668 .Bl -column YXZ description
1669 .It M Ta modified file
1670 .It D Ta file was deleted
1671 .It A Ta new file was added
1672 .It m Ta modified file modes (executable bit only)
1675 Files which are not part of the new commit will retain their previously
1676 recorded base commit.
1679 commands may refuse to run while the work tree contains files from
1680 multiple base commits.
1681 The base commit of such a work tree can be made consistent by running
1683 across the entire work tree.
1687 command requires the
1689 environment variable to be set,
1690 unless an author has been configured in
1696 configuration settings can be
1697 obtained from the repository's
1699 file or from Git's global
1708 Set author information in the newly created commit to
1710 This is useful when committing changes which were written by someone
1714 argument must use the same format as the
1716 environment variable.
1718 In addition to storing author information, the newly created commit
1721 information which is obtained, as usual, from the
1723 environment variable, or
1725 or Git configuration settings.
1727 Use the prepared log message stored in the file found at
1729 when creating the new commit.
1731 opens a temporary file in an editor where the prepared log message can be
1732 reviewed and edited further if needed.
1733 Cannot be used together with the
1737 Use the specified log message when creating the new commit.
1738 Cannot be used together with the
1742 This option prevents
1744 from opening the commit message in an editor.
1745 It has no effect unless it is used together with the
1747 option and is intended for non-interactive use such as scripting.
1749 This option prevents
1751 from generating a diff of the to-be-committed changes in a temporary file
1752 which can be viewed while editing a commit message.
1754 Allow the addition of symbolic links which point outside of the path space
1755 that is under version control.
1758 will reject such symbolic links due to safety concerns.
1761 may decide to represent such a symbolic link as a regular file which contains
1762 the link's target path, rather than creating an actual symbolic link which
1763 points outside of the work tree.
1764 Use of this option is discouraged because external mechanisms such as
1766 are better suited for managing symbolic links to paths not under
1771 will refuse to run if certain preconditions are not met.
1772 If the work tree's current branch is not in the
1774 reference namespace, new commits may not be created on this branch.
1775 Local changes may only be committed if they are based on file content
1776 found in the most recent commit on the work tree's branch.
1777 If a path is found to be out of date,
1779 must be used first in order to merge local changes with changes made
1787 .Op Fl r Ar repository-path
1789 .Op Ar remote-repository
1792 Send new changes to a remote repository.
1794 .Ar remote-repository
1798 The remote repository's URL is obtained from the corresponding entry in
1802 file of the local repository, as created by
1805 All objects corresponding to new changes will be written to a temporary
1806 pack file which is then uploaded to the server.
1807 Upon success, references in the
1809 reference namespace of the local repository will be updated to point at
1810 the commits which have been sent.
1812 By default, changes will only be sent if they are based on up-to-date
1813 copies of relevant branches in the remote repository.
1814 If any changes to be sent are based on out-of-date copies or would
1815 otherwise break linear history of existing branches, new changes must
1816 be fetched from the server with
1818 and local branches must be rebased with
1825 option can be used to make exceptions to these requirements.
1832 Send all branches from the local repository's
1834 reference namespace.
1837 option is equivalent to listing all branches with multiple
1840 Cannot be used together with the
1846 from the local repository's
1848 reference namespace.
1849 This option may be specified multiple times to build a list of branches
1851 If this option is not specified, default to the work tree's current branch
1852 if invoked in a work tree, or to the repository's HEAD reference.
1853 Cannot be used together with the
1857 Delete the specified
1859 from the remote repository's
1861 reference namespace.
1862 This option may be specified multiple times to build a list of branches
1865 Only references are deleted.
1866 Any commit, tree, tag, and blob objects belonging to deleted branches
1867 may become subject to deletion by Git's garbage collector running on
1870 Requesting deletion of branches results in an error if the server
1871 does not support this feature or disallows the deletion of branches
1872 based on its configuration.
1874 Attempt to force the server to overwrite existing branches or tags
1875 in the remote repository, even when
1879 would usually be required before changes can be sent.
1880 The server may reject forced requests regardless, depending on its
1883 Any commit, tree, tag, and blob objects belonging to overwritten branches
1884 or tags may become subject to deletion by Git's garbage collector running
1889 reference namespace is globally shared between all repositories.
1892 option to overwrite tags is discouraged because it can lead to
1893 inconsistencies between the tags present in different repositories.
1894 In general, creating a new tag with a different name is recommended
1895 instead of overwriting an existing tag.
1899 option is particularly discouraged if changes being sent are based
1900 on an out-of-date copy of a branch in the remote repository.
1901 Instead of using the
1903 option, new changes should
1906 and local branches should be rebased with
1908 followed by another attempt to send the changes.
1912 option should only be needed in situations where the remote repository's
1913 copy of a branch or tag is known to be out-of-date and is considered
1915 The risks of creating inconsistencies between different repositories
1916 should also be taken into account.
1918 Suppress progress reporting output.
1919 The same option will be passed to
1922 .It Fl r Ar repository-path
1923 Use the repository at the specified path.
1924 If not specified, assume the repository is located at or above the current
1926 If this directory is a
1928 work tree, use the repository path associated with this work tree.
1930 Attempt to send all tags from the local repository's
1932 reference namespace.
1935 option is equivalent to listing all tags with multiple
1938 Cannot be used together with the
1944 from the local repository's
1946 reference namespace, in addition to any branches that are being sent.
1949 option may be specified multiple times to build a list of tags to send.
1950 No tags will be sent if the
1954 Raise an error if the specified
1956 already exists in the remote repository, unless the
1958 option is used to overwrite the server's copy of the tag.
1959 In general, creating a new tag with a different name is recommended
1960 instead of overwriting an existing tag.
1962 Cannot be used together with the
1969 to print debugging messages to standard error output.
1970 The same option will be passed to
1973 Multiple -v options increase the verbosity.
1983 Merge changes from a single
1988 should be on a different branch than the work tree's base commit.
1989 The expected argument is a reference or a commit ID SHA1 hash.
1990 An abbreviated hash argument will be expanded to a full SHA1 hash
1991 automatically, provided the abbreviation is unique.
1993 Show the status of each affected file, using the following status codes:
1994 .Bl -column YXZ description
1995 .It G Ta file was merged
1996 .It C Ta file was merged and conflicts occurred during merge
1997 .It ! Ta changes destined for a missing file were not merged
1998 .It D Ta file was deleted
1999 .It d Ta file's deletion was prevented by local modifications
2000 .It A Ta new file was added
2001 .It \(a~ Ta changes destined for a non-regular file were not merged
2002 .It ? Ta changes destined for an unversioned file were not merged
2005 The merged changes will appear as local changes in the work tree, which
2008 amended manually or with further
2014 If invoked in a work tree where no
2019 operation is taking place,
2021 creates a record of commits which have been merged into the work tree.
2022 When a file changed by
2026 the log messages of relevant merged commits will then appear in the editor,
2027 where the messages must be further adjusted to convey the reasons for
2028 cherrypicking the changes.
2029 If all the changes in all files touched by a given commit are discarded,
2032 this commit's log message record will also disappear.
2035 will refuse to run if certain preconditions are not met.
2036 If the work tree contains multiple base commits, it must first be updated
2037 to a single base commit with
2039 If any relevant files already contain merge conflicts, these
2040 conflicts must be resolved first.
2048 Display a list of commit log messages recorded by cherrypick operations,
2049 represented by references in the
2050 .Dq refs/got/worktree
2051 reference namespace.
2054 is specified, only show the log message of the specified commit.
2056 If invoked in a work tree, only log messages recorded by cherrypick operations
2057 in the current work tree will be displayed.
2058 Otherwise, all commit log messages will be displayed irrespective of the
2059 work tree in which they were created.
2060 This option cannot be used with
2063 Delete log messages created by previous cherrypick operations, represented by
2065 .Dq refs/got/worktree
2066 reference namespace.
2069 is specified, only delete the log message of the specified commit.
2071 If invoked in a work tree, only log messages recorded by cherrypick operations
2072 in the current work tree will be deleted.
2073 Otherwise, all commit log messages will be deleted irrespective of the
2074 work tree in which they were created.
2075 This option cannot be used with
2086 Reverse-merge changes from a single
2091 should be on the same branch as the work tree's base commit.
2092 The expected argument is a reference or a commit ID SHA1 hash.
2093 An abbreviated hash argument will be expanded to a full SHA1 hash
2094 automatically, provided the abbreviation is unique.
2096 Show the status of each affected file, using the following status codes:
2097 .Bl -column YXZ description
2098 .It G Ta file was merged
2099 .It C Ta file was merged and conflicts occurred during merge
2100 .It ! Ta changes destined for a missing file were not merged
2101 .It D Ta file was deleted
2102 .It d Ta file's deletion was prevented by local modifications
2103 .It A Ta new file was added
2104 .It \(a~ Ta changes destined for a non-regular file were not merged
2105 .It ? Ta changes destined for an unversioned file were not merged
2108 The reverse-merged changes will appear as local changes in the work tree,
2109 which may be viewed with
2111 amended manually or with further
2117 If invoked in a work tree where no
2122 operation is taking place,
2124 creates a record of commits which have been reverse-merged into the work tree.
2125 When a file changed by
2129 the log messages of relevant reverse-merged commits will then appear in
2130 the editor, where the messages must be further adjusted to convey the
2131 reasons for backing out the changes.
2132 If all the changes in all files touched by a given commit are discarded,
2135 this commit's log message record will also disappear.
2138 will refuse to run if certain preconditions are not met.
2139 If the work tree contains multiple base commits, it must first be updated
2140 to a single base commit with
2142 If any relevant files already contain merge conflicts, these
2143 conflicts must be resolved first.
2151 Display a list of commit log messages recorded by backout operations,
2152 represented by references in the
2153 .Dq refs/got/worktree
2154 reference namespace.
2157 is specified, only show the log message of the specified commit.
2159 If invoked in a work tree, only log messages recorded by backout operations
2160 in the current work tree will be displayed.
2161 Otherwise, all commit log messages will be displayed irrespective of the
2162 work tree in which they were created.
2163 This option cannot be used with
2166 Delete log messages created by previous backout operations, represented by
2168 .Dq refs/got/worktree
2169 reference namespace.
2172 is specified, only delete the log message of the specified commit.
2174 If invoked in a work tree, only log messages recorded by backout operations
2175 in the current work tree will be deleted.
2176 Otherwise, all commit log messages will be deleted irrespective of the
2177 work tree in which they were created.
2178 This option cannot be used with
2189 Rebase commits on the specified
2191 onto the tip of the current branch of the work tree.
2194 must share common ancestry with the work tree's current branch.
2195 Rebasing begins with the first descendant commit of the youngest
2196 common ancestor commit shared by the specified
2198 and the work tree's current branch, and stops once the tip commit
2205 is used as intended, the specified
2207 represents a local commit history and may already contain changes
2208 that are not yet visible in any other repositories.
2209 The work tree's current branch, which must be set with
2213 operation, represents a branch from a remote repository which shares
2214 a common history with the specified
2216 but has progressed, and perhaps diverged, due to commits added to the
2219 Rebased commits are accumulated on a temporary branch which the work tree
2220 will remain switched to throughout the entire rebase operation.
2221 Commits on this branch represent the same changes with the same log
2222 messages as their counterparts on the original
2224 but with different commit IDs.
2225 Once rebasing has completed successfully, the temporary branch becomes
2226 the new version of the specified
2228 and the work tree is automatically switched to it.
2229 If author information is available via the
2231 environment variable,
2237 configuration settings, this author information will be used to identify
2242 Old commits in their pre-rebase state are automatically backed up in the
2243 .Dq refs/got/backup/rebase
2244 reference namespace.
2245 As long as these references are not removed older versions of rebased
2246 commits will remain in the repository and can be viewed with the
2249 Removal of these references makes objects which become unreachable via
2250 any reference subject to removal by Git's garbage collector or
2251 .Cm gotadmin cleanup .
2253 While rebasing commits, show the status of each affected file,
2254 using the following status codes:
2255 .Bl -column YXZ description
2256 .It G Ta file was merged
2257 .It C Ta file was merged and conflicts occurred during merge
2258 .It ! Ta changes destined for a missing file were not merged
2259 .It D Ta file was deleted
2260 .It d Ta file's deletion was prevented by local modifications
2261 .It A Ta new file was added
2262 .It \(a~ Ta changes destined for a non-regular file were not merged
2263 .It ? Ta changes destined for an unversioned file were not merged
2266 If merge conflicts occur, the rebase operation is interrupted and may
2267 be continued once conflicts have been resolved.
2268 If any files with destined changes are found to be missing or unversioned,
2269 or if files could not be deleted due to differences in deleted content,
2270 the rebase operation will be interrupted to prevent potentially incomplete
2271 changes from being committed to the repository without user intervention.
2272 The work tree may be modified as desired and the rebase operation can be
2273 continued once the changes present in the work tree are considered complete.
2274 Alternatively, the rebase operation may be aborted which will leave
2276 unmodified and the work tree switched back to its original branch.
2278 If a merge conflict is resolved in a way which renders the merged
2279 change into a no-op change, the corresponding commit will be elided
2280 when the rebase operation continues.
2283 will refuse to run if certain preconditions are not met.
2288 reference namespace, the branch may not be rebased.
2289 If the work tree is not yet fully updated to the tip commit of its
2290 branch, then the work tree must first be updated with
2292 If changes have been staged with
2294 these changes must first be committed with
2298 If the work tree contains local changes, these changes must first be
2305 contains changes to files outside of the work tree's path prefix,
2306 the work tree cannot be used to rebase this branch.
2315 commands will refuse to run while a rebase operation is in progress.
2316 Other commands which manipulate the work tree may be used for
2317 conflict resolution purposes.
2321 is already based on the work tree's current branch, then no commits
2322 need to be rebased and
2324 will simply switch the work tree to the specified
2326 and update files in the work tree accordingly.
2333 Abort an interrupted rebase operation.
2334 If this option is used, no other command-line arguments are allowed.
2336 Continue an interrupted rebase operation.
2337 If this option is used, no other command-line arguments are allowed.
2339 Show a list of past rebase operations, represented by references in the
2340 .Dq refs/got/backup/rebase
2341 reference namespace.
2343 Display the author, date, and log message of each backed up commit,
2344 the object ID of the corresponding post-rebase commit, and
2345 the object ID of their common ancestor commit.
2346 Given these object IDs,
2353 options can be used to examine the history of either version of the branch,
2358 option can be used to create a new branch from a pre-rebase state if desired.
2362 is specified, only show commits which at some point in time represented this
2364 Otherwise, list all backed up commits for any branches.
2366 If this option is used,
2368 does not require a work tree.
2369 None of the other options can be used together with
2372 Delete backups created by past rebase operations, represented by references
2374 .Dq refs/got/backup/rebase
2375 reference namespace.
2379 is specified, only delete backups which at some point in time represented
2381 Otherwise, delete all references found within
2382 .Dq refs/got/backup/rebase .
2384 Any commit, tree, tag, and blob objects belonging to deleted backups
2385 remain in the repository and may be removed separately with
2386 Git's garbage collector or
2387 .Cm gotadmin cleanup .
2389 If this option is used,
2391 does not require a work tree.
2392 None of the other options can be used together with
2399 .Op Fl F Ar histedit-script
2403 Edit commit history between the work tree's current base commit and
2404 the tip commit of the work tree's current branch.
2408 command requires the
2410 environment variable to be set,
2411 unless an author has been configured in
2417 configuration settings can be obtained from the repository's
2419 file or from Git's global
2425 operation, the work tree's current branch must be set with
2427 to the branch which should be edited, unless this branch is already the
2428 current branch of the work tree.
2429 The tip of this branch represents the upper bound (inclusive) of commits
2434 Furthermore, the work tree's base commit
2437 to a point in this branch's commit history where editing should begin.
2438 This commit represents the lower bound (non-inclusive) of commits touched
2443 Editing of commit history is controlled via a
2445 which can be written in an editor based on a template, passed on the
2446 command line, or generated with the
2452 The format of the histedit script is line-based.
2453 Each line in the script begins with a command name, followed by
2454 whitespace and an argument.
2455 For most commands, the expected argument is a commit ID SHA1 hash.
2456 Any remaining text on the line is ignored.
2457 Lines which begin with the
2459 character are ignored entirely.
2461 The available histedit script commands are as follows:
2462 .Bl -column YXZ pick-commit
2463 .It Cm pick Ar commit Ta Use the specified commit as it is.
2464 .It Cm edit Ar commit Ta Use the specified commit but once changes have been
2465 merged into the work tree interrupt the histedit operation for amending.
2466 .It Cm fold Ar commit Ta Combine the specified commit with the next commit
2467 listed further below that will be used.
2468 .It Cm drop Ar commit Ta Remove this commit from the edited history.
2469 .It Cm mesg Oo Ar log-message Oc Ta Create a new log message for the commit of
2474 command on the previous line of the histedit script.
2477 argument provides a new single-line log message to use.
2480 argument is omitted, open an editor where a new log message can be written.
2483 Every commit in the history being edited must be mentioned in the script.
2484 Lines may be re-ordered to change the order of commits in the edited history.
2485 No commit may be listed more than once.
2487 Edited commits are accumulated on a temporary branch which the work tree
2488 will remain switched to throughout the entire histedit operation.
2489 Once history editing has completed successfully, the temporary branch becomes
2490 the new version of the work tree's branch and the work tree is automatically
2493 Old commits in their pre-histedit state are automatically backed up in the
2494 .Dq refs/got/backup/histedit
2495 reference namespace.
2496 As long as these references are not removed older versions of edited
2497 commits will remain in the repository and can be viewed with the
2500 Removal of these references makes objects which become unreachable via
2501 any reference subject to removal by Git's garbage collector or
2502 .Cm gotadmin cleanup .
2504 While merging commits, show the status of each affected file,
2505 using the following status codes:
2506 .Bl -column YXZ description
2507 .It G Ta file was merged
2508 .It C Ta file was merged and conflicts occurred during merge
2509 .It ! Ta changes destined for a missing file were not merged
2510 .It D Ta file was deleted
2511 .It d Ta file's deletion was prevented by local modifications
2512 .It A Ta new file was added
2513 .It \(a~ Ta changes destined for a non-regular file were not merged
2514 .It ? Ta changes destined for an unversioned file were not merged
2517 If merge conflicts occur, the histedit operation is interrupted and may
2518 be continued once conflicts have been resolved.
2519 If any files with destined changes are found to be missing or unversioned,
2520 or if files could not be deleted due to differences in deleted content,
2521 the histedit operation will be interrupted to prevent potentially incomplete
2522 changes from being committed to the repository without user intervention.
2523 The work tree may be modified as desired and the histedit operation can be
2524 continued once the changes present in the work tree are considered complete.
2525 Alternatively, the histedit operation may be aborted which will leave
2526 the work tree switched back to its original branch.
2528 If a merge conflict is resolved in a way which renders the merged
2529 change into a no-op change, the corresponding commit will be elided
2530 when the histedit operation continues.
2533 will refuse to run if certain preconditions are not met.
2534 If the work tree's current branch is not in the
2536 reference namespace, the history of the branch may not be edited.
2537 If the work tree contains multiple base commits, it must first be updated
2538 to a single base commit with
2540 If changes have been staged with
2542 these changes must first be committed with
2546 If the work tree contains local changes, these changes must first be
2551 If the edited history contains changes to files outside of the work tree's
2552 path prefix, the work tree cannot be used to edit the history of this branch.
2560 commands will refuse to run while a histedit operation is in progress.
2561 Other commands which manipulate the work tree may be used, and the
2563 command may be used to commit arbitrary changes to the temporary branch
2564 while the histedit operation is interrupted.
2571 Abort an interrupted histedit operation.
2572 If this option is used, no other command-line arguments are allowed.
2574 Continue an interrupted histedit operation.
2575 If this option is used, no other command-line arguments are allowed.
2578 This option is a quick equivalent to a histedit script which drops all
2582 option can only be used when starting a new histedit operation.
2583 If this option is used, no other command-line arguments are allowed.
2585 Interrupt the histedit operation for editing after merging each commit.
2586 This option is a quick equivalent to a histedit script which uses the
2588 command for all commits.
2591 option can only be used when starting a new histedit operation.
2592 If this option is used, no other command-line arguments are allowed.
2593 .It Fl F Ar histedit-script
2596 instead of opening a temporary file in an editor where a histedit script
2599 Fold all commits into a single commit.
2600 This option is a quick equivalent to a histedit script which folds all
2601 commits, combining them all into one commit.
2604 option can only be used when starting a new histedit operation.
2605 If this option is used, no other command-line arguments are allowed.
2607 Show a list of past histedit operations, represented by references in the
2608 .Dq refs/got/backup/histedit
2609 reference namespace.
2611 Display the author, date, and log message of each backed up commit,
2612 the object ID of the corresponding post-histedit commit, and
2613 the object ID of their common ancestor commit.
2614 Given these object IDs,
2621 options can be used to examine the history of either version of the branch,
2626 option can be used to create a new branch from a pre-histedit state if desired.
2630 is specified, only show commits which at some point in time represented this
2632 Otherwise, list all backed up commits for any branches.
2634 If this option is used,
2636 does not require a work tree.
2637 None of the other options can be used together with
2640 Edit log messages only.
2641 This option is a quick equivalent to a histedit script which edits
2642 only log messages but otherwise leaves every picked commit as-is.
2645 option can only be used when starting a new histedit operation.
2646 If this option is used, no other command-line arguments are allowed.
2648 Delete backups created by past histedit operations, represented by references
2650 .Dq refs/got/backup/histedit
2651 reference namespace.
2655 is specified, only delete backups which at some point in time represented
2657 Otherwise, delete all references found within
2658 .Dq refs/got/backup/histedit .
2660 Any commit, tree, tag, and blob objects belonging to deleted backups
2661 remain in the repository and may be removed separately with
2662 Git's garbage collector or
2663 .Cm gotadmin cleanup .
2665 If this option is used,
2667 does not require a work tree.
2668 None of the other options can be used together with
2672 .It Cm integrate Ar branch
2674 Integrate the specified
2676 into the work tree's current branch.
2677 Files in the work tree are updated to match the contents on the integrated
2679 and the reference of the work tree's branch is changed to point at the
2680 head commit of the integrated
2683 Both branches can be considered equivalent after integration since they
2684 will be pointing at the same commit.
2685 Both branches remain available for future work, if desired.
2686 In case the integrated
2688 is no longer needed it may be deleted with
2691 Show the status of each affected file, using the following status codes:
2692 .Bl -column YXZ description
2693 .It U Ta file was updated
2694 .It D Ta file was deleted
2695 .It A Ta new file was added
2696 .It \(a~ Ta versioned file is obstructed by a non-regular file
2697 .It ! Ta a missing versioned file was restored
2701 will refuse to run if certain preconditions are not met.
2702 Most importantly, the
2704 must have been rebased onto the work tree's current branch with
2706 before it can be integrated, in order to linearize commit history and
2707 resolve merge conflicts.
2708 If the work tree contains multiple base commits, it must first be updated
2709 to a single base commit with
2711 If changes have been staged with
2713 these changes must first be committed with
2717 If the work tree contains local changes, these changes must first be
2729 Create a merge commit based on the current branch of the work tree and
2732 If a linear project history is desired, then use of
2734 should be preferred over
2736 However, even strictly linear projects may require merge commits in order
2737 to merge in new versions of third-party code stored on vendor branches
2741 Merge commits are commits based on multiple parent commits.
2742 The tip commit of the work tree's current branch, which must be set with
2746 operation, will be used as the first parent.
2747 The tip commit of the specified
2749 will be used as the second parent.
2751 No ancestral relationship between the two branches is required.
2752 If the two branches have already been merged previously, only new changes
2755 It is not possible to create merge commits with more than two parents.
2756 If more than one branch needs to be merged, then multiple merge commits
2757 with two parents each can be created in sequence.
2759 While merging changes found on the
2761 into the work tree, show the status of each affected file,
2762 using the following status codes:
2763 .Bl -column YXZ description
2764 .It G Ta file was merged
2765 .It C Ta file was merged and conflicts occurred during merge
2766 .It ! Ta changes destined for a missing file were not merged
2767 .It D Ta file was deleted
2768 .It d Ta file's deletion was prevented by local modifications
2769 .It A Ta new file was added
2770 .It \(a~ Ta changes destined for a non-regular file were not merged
2771 .It ? Ta changes destined for an unversioned file were not merged
2774 If merge conflicts occur, the merge operation is interrupted and conflicts
2775 must be resolved before the merge operation can continue.
2776 If any files with destined changes are found to be missing or unversioned,
2777 or if files could not be deleted due to differences in deleted content,
2778 the merge operation will be interrupted to prevent potentially incomplete
2779 changes from being committed to the repository without user intervention.
2780 The work tree may be modified as desired and the merge can be continued
2781 once the changes present in the work tree are considered complete.
2782 Alternatively, the merge operation may be aborted which will leave
2783 the work tree's current branch unmodified.
2785 If a merge conflict is resolved in a way which renders all merged
2786 changes into no-op changes, the merge operation cannot continue
2787 and must be aborted.
2790 will refuse to run if certain preconditions are not met.
2793 is based on the work tree's current branch, then no merge commit can
2796 may be used to integrate the
2799 If the work tree is not yet fully updated to the tip commit of its
2800 branch, then the work tree must first be updated with
2802 If the work tree contains multiple base commits, it must first be updated
2803 to a single base commit with
2805 If changes have been staged with
2807 these changes must first be committed with
2811 If the work tree contains local changes, these changes must first be
2818 contains changes to files outside of the work tree's path prefix,
2819 the work tree cannot be used to merge this branch.
2829 commands will refuse to run while a merge operation is in progress.
2830 Other commands which manipulate the work tree may be used for
2831 conflict resolution purposes.
2838 Abort an interrupted merge operation.
2839 If this option is used, no other command-line arguments are allowed.
2841 Continue an interrupted merge operation.
2842 If this option is used, no other command-line arguments are allowed.
2844 Merge changes into the work tree as usual but do not create a merge
2846 The merge result can be adjusted as desired before a merge commit is
2849 Alternatively, the merge may be aborted with
2856 .Op Fl F Ar response-script
2860 Stage local changes for inclusion in the next commit.
2863 is specified, stage all changes in the work tree.
2864 Otherwise, stage changes at or within the specified paths.
2865 Paths may be staged if they are added, modified, or deleted according to
2868 Show the status of each affected file, using the following status codes:
2869 .Bl -column YXZ description
2870 .It A Ta file addition has been staged
2871 .It M Ta file modification has been staged
2872 .It D Ta file deletion has been staged
2875 Staged file contents are saved in newly created blob objects in the repository.
2876 These blobs will be referred to by tree objects once staged changes have been
2879 Staged changes affect the behaviour of
2884 While paths with staged changes exist, the
2886 command will refuse to commit any paths which do not have staged changes.
2887 Local changes created on top of staged changes can only be committed if
2888 the path is staged again, or if the staged changes are committed first.
2891 command will show both local changes and staged changes.
2894 command is able to display local changes relative to staged changes,
2895 and to display staged changes relative to the repository.
2898 command cannot revert staged changes but may be used to revert
2899 local changes created on top of staged changes.
2905 .It Fl F Ar response-script
2913 responses line-by-line from the specified
2915 file instead of prompting interactively.
2917 Instead of staging new changes, list paths which are already staged,
2918 along with the IDs of staged blob objects and stage status codes.
2919 If paths were provided on the command line, show the staged paths
2920 among the specified paths.
2921 Otherwise, show all staged paths.
2923 Instead of staging the entire content of a changed file, interactively
2924 select or reject changes for staging based on
2928 (reject change), and
2930 (quit staging this file) responses.
2931 If a file is in modified status, individual patches derived from the
2932 modified file content can be staged.
2933 Files in added or deleted status may only be staged or rejected in
2936 Allow staging of symbolic links which point outside of the path space
2937 that is under version control.
2940 will reject such symbolic links due to safety concerns.
2943 may decide to represent such a symbolic link as a regular file which contains
2944 the link's target path, rather than creating an actual symbolic link which
2945 points outside of the work tree.
2946 Use of this option is discouraged because external mechanisms such as
2948 are better suited for managing symbolic links to paths not under
2953 will refuse to run if certain preconditions are not met.
2954 If a file contains merge conflicts, these conflicts must be resolved first.
2955 If a file is found to be out of date relative to the head commit on the
2956 work tree's current branch, the file must be updated with
2958 before it can be staged (however, this does not prevent the file from
2959 becoming out-of-date at some point after having been staged).
2966 commands will refuse to run while staged changes exist.
2967 If staged changes cannot be committed because a staged path
2968 is out of date, the path must be unstaged with
2970 before it can be updated with
2972 and may then be staged again if necessary.
2977 .Op Fl F Ar response-script
2981 Merge staged changes back into the work tree and put affected paths
2982 back into non-staged status.
2985 is specified, unstage all staged changes across the entire work tree.
2986 Otherwise, unstage changes at or within the specified paths.
2988 Show the status of each affected file, using the following status codes:
2989 .Bl -column YXZ description
2990 .It G Ta file was unstaged
2991 .It C Ta file was unstaged and conflicts occurred during merge
2992 .It ! Ta changes destined for a missing file were not merged
2993 .It D Ta file was staged as deleted and still is deleted
2994 .It d Ta file's deletion was prevented by local modifications
2995 .It \(a~ Ta changes destined for a non-regular file were not merged
3002 .It Fl F Ar response-script
3010 responses line-by-line from the specified
3012 file instead of prompting interactively.
3014 Instead of unstaging the entire content of a changed file, interactively
3015 select or reject changes for unstaging based on
3019 (keep change staged), and
3021 (quit unstaging this file) responses.
3022 If a file is staged in modified status, individual patches derived from the
3023 staged file content can be unstaged.
3024 Files staged in added or deleted status may only be unstaged in their entirety.
3030 .Op Fl r Ar repository-path
3033 Parse and print contents of objects to standard output in a line-based
3035 Content of commit, tree, and tag objects is printed in a way similar
3036 to the actual content stored in such objects.
3037 Blob object contents are printed as they would appear in files on disk.
3039 Attempt to interpret each argument as a reference, a tag name, or
3040 an object ID SHA1 hash.
3041 References will be resolved to an object ID.
3042 Tag names will resolved to a tag object.
3043 An abbreviated hash argument will be expanded to a full SHA1 hash
3044 automatically, provided the abbreviation is unique.
3046 If none of the above interpretations produce a valid result, or if the
3048 option is used, attempt to interpret the argument as a path which will
3049 be resolved to the ID of an object found at this path in the repository.
3056 Look up paths in the specified
3058 If this option is not used, paths are looked up in the commit resolved
3059 via the repository's HEAD reference.
3060 The expected argument is a commit ID SHA1 hash or an existing reference
3061 or tag name which will be resolved to a commit ID.
3062 An abbreviated hash argument will be expanded to a full SHA1 hash
3063 automatically, provided the abbreviation is unique.
3065 Interpret all arguments as paths only.
3066 This option can be used to resolve ambiguity in cases where paths
3067 look like tag names, reference names, or object IDs.
3068 .It Fl r Ar repository-path
3069 Use the repository at the specified path.
3070 If not specified, assume the repository is located at or above the current
3072 If this directory is a
3074 work tree, use the repository path associated with this work tree.
3076 .It Cm info Op Ar path ...
3077 Display meta-data stored in a work tree.
3082 The work tree to use is resolved implicitly by walking upwards from the
3083 current working directory.
3087 arguments are specified, show additional per-file information for tracked
3088 files located at or within these paths.
3091 argument corresponds to the work tree's root directory, display information
3092 for all tracked files.
3095 .Bl -tag -width GOT_IGNORE_GITCONFIG
3097 The author's name and email address, such as
3098 .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
3108 may fail to parse commits without an email address in author data,
3112 environment variables with a missing email address.
3114 .Ev GOT_AUTHOR will be overridden by configuration settings in
3120 configuration settings in the repository's
3127 configuration settings contained in Git's global
3129 configuration file will only be used if neither
3133 environment variable provide author information.
3134 .It Ev GOT_IGNORE_GITCONFIG
3135 If this variable is set then any remote repository definitions or author
3136 information found in Git configuration files will be ignored.
3137 .It Ev GOT_LOG_DEFAULT_LIMIT
3138 The default limit on the number of commits traversed by
3140 If set to zero, the limit is unbounded.
3141 This variable will be silently ignored if it is set to a non-numeric value.
3142 .It Ev VISUAL , EDITOR
3143 The editor spawned by
3151 text editor will be spawned in order to give
3153 the attention it deserves.
3156 .Bl -tag -width packed-refs -compact
3158 Repository-wide configuration settings for
3162 configuration file located in the root directory of a Git repository
3163 supersedes any relevant settings in Git's
3167 .It Pa .got/got.conf
3168 Worktree-specific configuration settings for
3172 configuration file in the
3174 meta-data directory of a work tree supersedes any relevant settings in
3177 configuration file and Git's
3184 Enable tab-completion of
3189 .Dl $ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
3191 Clone an existing Git repository for use with
3195 .Dl $ got clone ssh://git@github.com/openbsd/src.git
3197 Use of HTTP URLs currently requires
3201 .Dl $ git clone --bare https://github.com/openbsd/src.git
3203 Alternatively, for quick and dirty local testing of
3205 a new Git repository could be created and populated with files,
3206 e.g. from a temporary CVS checkout located at
3209 .Dl $ gotadmin init /var/git/src.git
3210 .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
3212 Check out a work tree from the Git repository to /usr/src:
3214 .Dl $ got checkout /var/git/src.git /usr/src
3216 View local changes in a work tree directory:
3218 .Dl $ got diff | less
3220 In a work tree, display files in a potentially problematic state:
3222 .Dl $ got status -s 'C!~?'
3224 Interactively revert selected local changes in a work tree directory:
3226 .Dl $ got revert -p -R\ .
3228 In a work tree or a git repository directory, list all branch references:
3232 As above, but list the most recently modified branches only:
3234 .Dl $ got branch -lt | head
3236 In a work tree or a git repository directory, create a new branch called
3237 .Dq unified-buffer-cache
3238 which is forked off the
3242 .Dl $ got branch -c master unified-buffer-cache
3244 Switch an existing work tree to the branch
3245 .Dq unified-buffer-cache .
3246 Local changes in the work tree will be preserved and merged if necessary:
3248 .Dl $ got update -b unified-buffer-cache
3250 Create a new commit from local changes in a work tree directory.
3251 This new commit will become the head commit of the work tree's current branch:
3255 In a work tree or a git repository directory, view changes committed in
3256 the 3 most recent commits to the work tree's branch, or the branch resolved
3257 via the repository's HEAD reference, respectively:
3259 .Dl $ got log -p -l 3
3261 As above, but display changes in the order in which
3263 could apply them in sequence:
3265 .Dl $ got log -p -l 3 -R
3267 In a work tree or a git repository directory, log the history of a subdirectory:
3269 .Dl $ got log sys/uvm
3271 While operating inside a work tree, paths are specified relative to the current
3272 working directory, so this command will log the subdirectory
3275 .Dl $ cd sys/uvm && got log\ .
3277 And this command has the same effect:
3279 .Dl $ cd sys/dev/usb && got log ../../uvm
3281 And this command displays work tree meta-data about all tracked files:
3284 .Dl $ got info\ . | less
3286 Add new files and remove obsolete files in a work tree directory:
3288 .Dl $ got add sys/uvm/uvm_ubc.c
3289 .Dl $ got remove sys/uvm/uvm_vnode.c
3291 Create a new commit from local changes in a work tree directory
3292 with a pre-defined log message.
3294 .Dl $ got commit -m 'unify the buffer cache'
3296 Alternatively, create a new commit from local changes in a work tree
3297 directory with a log message that has been prepared in the file
3300 .Dl $ got commit -F /tmp/msg
3302 Update any work tree checked out from the
3303 .Dq unified-buffer-cache
3304 branch to the latest commit on this branch:
3308 Roll file content on the unified-buffer-cache branch back by one commit,
3309 and then fetch the rolled-back change into the work tree as a local change
3310 to be amended and perhaps committed again:
3312 .Dl $ got backout unified-buffer-cache
3313 .Dl $ got commit -m 'roll back previous'
3314 .Dl $ # now back out the previous backout :-)
3315 .Dl $ got backout unified-buffer-cache
3317 Fetch new changes on the remote repository's
3319 branch, making them visible on the local repository's
3326 In a repository created with a HTTP URL and
3327 .Cm git clone --bare
3330 command must be used instead:
3332 .Dl $ cd /var/git/src.git
3333 .Dl $ git fetch origin master:refs/remotes/origin/master
3337 branch to merge the new changes that are now visible on the
3342 .Dl $ got update -b origin/master
3343 .Dl $ got rebase master
3346 .Dq unified-buffer-cache
3347 branch on top of the new head commit of the
3351 .Dl $ got update -b master
3352 .Dl $ got rebase unified-buffer-cache
3354 Create a patch from all changes on the unified-buffer-cache branch.
3355 The patch can be mailed out for review and applied to
3359 .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
3361 Edit the entire commit history of the
3362 .Dq unified-buffer-cache
3365 .Dl $ got update -b unified-buffer-cache
3366 .Dl $ got update -c master
3369 Before working against existing branches in a repository cloned with
3370 .Cm git clone --bare
3375 must be configured to map all references in the remote repository
3378 namespace of the local repository.
3379 This can be achieved by setting Git's
3380 .Pa remote.origin.fetch
3381 configuration variable to the value
3382 .Dq +refs/heads/*:refs/remotes/origin/*
3387 .Dl $ cd /var/git/repo
3388 .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
3392 option must be disabled:
3394 .Dl $ cd /var/git/repo
3395 .Dl $ git config remote.origin.mirror false
3397 Alternatively, the following
3399 configuration item can be added manually to the Git repository's
3403 .Dl [remote \&"origin\&"]
3405 .Dl fetch = +refs/heads/*:refs/remotes/origin/*
3408 This configuration leaves the local repository's
3410 namespace free for use by local branches checked out with
3412 and, if needed, created with
3415 .Dq refs/remotes/origin
3416 namespace can now be updated with incoming changes from the remote
3421 without extra command line arguments.
3422 Newly fetched changes can be examined with
3425 Display changes on the remote repository's version of the
3427 branch, as of the last time
3431 .Dl $ got log -c origin/master | less
3433 As shown here, most commands accept abbreviated reference names such as
3436 .Dq refs/remotes/origin/master .
3437 The latter is only needed in case of ambiguity.
3440 must be used to merge changes which are visible on the
3445 This will also merge local changes, if any, with the incoming changes:
3447 .Dl $ got update -b origin/master
3448 .Dl $ got rebase master
3450 In order to make changes committed to the
3451 .Dq unified-buffer-cache
3455 .Dq unified-buffer-cache
3456 branch must first be rebased onto the
3460 .Dl $ got update -b master
3461 .Dl $ got rebase unified-buffer-cache
3464 .Dq unified-buffer-cache
3465 branch can now be made visible on the
3469 Because the rebase operation switched the work tree to the
3470 .Dq unified-buffer-cache
3471 branch, the work tree must be switched back to the
3475 .Dl $ got update -b master
3476 .Dl $ got integrate unified-buffer-cache
3480 branch, log messages for local changes can now be amended with
3482 by other developers and any other important new information:
3484 .Dl $ got update -c origin/master
3485 .Dl $ got histedit -m
3487 If the remote repository offers write access, local changes on the
3489 branch can be sent to the remote repository with
3493 can be run without further arguments.
3494 The arguments shown here match defaults, provided the work tree's
3495 current branch is the
3499 .Dl $ got send -b master origin
3501 If the remote repository requires the HTTPS protocol, the
3503 command must be used instead:
3505 .Dl $ cd /var/git/src.git
3506 .Dl $ git push origin master
3508 When making contributions to projects which use the
3510 workflow, SSH protocol repository access needs to be set up first.
3511 Once an account has been created on a Git hosting site it should
3512 be possible to upload a public SSH key for repository access
3517 workflow will usually involve two remote repositories.
3518 In the real-life example below, the
3520 repository was forked from the
3522 repository by using the Git hosting site's web interface.
3525 file in the local repository describes both remote repositories:
3526 .Bd -literal -offset indent
3527 # Jelmers's repository, which accepts pull requests
3529 server git@github.com
3531 repository "/jelmer/dulwich"
3535 # Stefan's fork, used as the default remote repository
3537 server git@github.com
3539 repository "/stspdotname/dulwich"
3544 With this configuration, Stefan can create commits on
3545 .Dq refs/heads/master
3546 and send them to the
3548 repository by running:
3550 .Dl $ got send -b master origin
3552 The changes can now be proposed to Jelmer by opening a pull request
3553 via the Git hosting site's web interface.
3554 If Jelmer requests further changes to be made, additional commits
3555 can be created on the
3557 branch and be added to the pull request by running
3561 If Jelmer prefers additional commits to be
3563 then the following commands can be used to achieve this:
3565 .Dl $ got update -b master
3566 .Dl $ got update -c origin/master
3567 .Dl $ got histedit -f
3568 .Dl $ got send -f -b master origin
3570 Once Jelmer has accepted the pull request, Stefan can fetch the
3571 merged changes, and possibly several other new changes, by running:
3573 .Dl $ got fetch upstream
3575 The merged changes will now be visible under the reference
3576 .Dq refs/remotes/upstream/master .
3579 branch can now be rebased on top of the latest changes
3582 .Dl $ got update -b upstream/master
3583 .Dl $ got rebase master
3585 As a final step, the forked repository's copy of the master branch needs
3586 to be kept in sync by sending the new changes there:
3588 .Dl $ got send -f -b master origin
3590 If multiple pull requests need to be managed in parallel, a separate branch
3591 must be created for each pull request with
3593 Each such branch can then be used as above, in place of
3594 .Dq refs/heads/master .
3595 Changes for any accepted pull requests will still appear under
3596 .Dq refs/remotes/upstream/master,
3597 regardless of which branch was used in the forked repository to
3598 create a pull request.
3602 .Xr git-repository 5 ,
3603 .Xr got-worktree 5 ,
3607 .An Anthony J. Bentley Aq Mt bentley@openbsd.org
3608 .An Christian Weisgerber Aq Mt naddy@openbsd.org
3609 .An Hiltjo Posthuma Aq Mt hiltjo@codemadness.org
3610 .An Josh Rickmar Aq Mt jrick@zettaport.com
3611 .An Joshua Stein Aq Mt jcs@openbsd.org
3612 .An Klemens Nanni Aq Mt kn@openbsd.org
3613 .An Martin Pieuchot Aq Mt mpi@openbsd.org
3614 .An Neels Hofmeyr Aq Mt neels@hofmeyr.de
3615 .An Omar Polo Aq Mt op@openbsd.org
3616 .An Ori Bernstein Aq Mt ori@openbsd.org
3617 .An Sebastien Marie Aq Mt semarie@openbsd.org
3618 .An Stefan Sperling Aq Mt stsp@openbsd.org
3619 .An Steven McDonald Aq Mt steven@steven-mcdonald.id.au
3620 .An Theo Buehler Aq Mt tb@openbsd.org
3621 .An Thomas Adam Aq Mt thomas@xteddy.org
3622 .An Tracey Emery Aq Mt tracey@traceyemery.net
3623 .An Yang Zhong Aq Mt yzhong@freebsdfoundation.org
3630 were derived from code under copyright by:
3632 .An Caldera International
3633 .An Daniel Hartmeier
3638 .An Jean-Francois Brousseau
3644 .An Niklas Hallqvist
3649 .An Xavier Santolaria
3652 contains code contributed to the public domain by
3653 .An Austin Appleby .
3656 is a work-in-progress and some features remain to be implemented.
3658 At present, the user has to fall back on
3660 to perform some tasks.
3664 Reading from remote repositories over HTTP or HTTPS protocols requires
3669 Writing to remote repositories over HTTP or HTTPS protocols requires
3672 The creation of merge commits with more than two parent commits requires
3675 In situations where files or directories were moved around
3677 will not automatically merge changes to new locations and
3679 will usually produce better results.
