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
120 Ignore patterns which end with a slash,
122 will only match directories.
124 Use the specified log message when creating the new commit.
129 opens a temporary file in an editor where a log message can be written.
130 .It Fl r Ar repository-path
131 Use the repository at the specified path.
132 If not specified, assume the repository is located at or above the current
140 .Op Fl R Ar reference
145 Clone a Git repository at the specified
151 is specified, the directory name will be derived from the name of the
154 will refuse to run if the
160 specifies a protocol scheme, a server hostname, an optional port number
161 separated from the hostname by a colon, and a path to the repository on
163 .Lk scheme://hostname:port/path/to/repository
165 The following protocol schemes are supported:
166 .Bl -tag -width git+ssh
168 The Git protocol as implemented by the
171 Use of this protocol is discouraged since it supports neither authentication
174 The Git protocol wrapped in an authenticated and encrypted
177 With this protocol the hostname may contain an embedded username for
182 Short alias for git+ssh.
185 Objects in the cloned repository are stored in a pack file which is downloaded
187 This pack file will then be indexed to facilitate access to the objects stored
189 If any objects in the pack file are stored in deltified form, all deltas will
190 be fully resolved in order to compute the ID of such objects.
191 This can take some time.
192 More details about the pack file format are documented in
193 .Xr git-repository 5 .
196 creates a remote repository entry in the
200 files of the cloned repository to store the
206 arguments for future use by
216 Fetch all branches from the remote repository's
218 reference namespace and set
219 .Cm fetch_all_branches
220 in the cloned repository's
222 file for future use by
224 If this option is not specified, a branch resolved via the remote
225 repository's HEAD reference will be fetched.
226 Cannot be used together with the
232 from the remote repository's
235 This option may be specified multiple times to build a list of branches
237 If the branch corresponding to the remote repository's HEAD reference is not
238 in this list, the cloned repository's HEAD reference will be set to the first
239 branch which was fetched.
240 If this option is not specified, a branch resolved via the remote
241 repository's HEAD reference will be fetched.
242 Cannot be used together with the
246 List branches and tags available for fetching from the remote repository
247 and exit immediately.
248 Cannot be used together with any of the other options except
253 Create the cloned repository as a mirror of the original repository.
254 This is useful if the cloned repository will not be used to store
255 locally created commits.
261 files will be set up with the
263 option enabled, such that
267 will write incoming changes directly to branches in the
269 reference namespace, rather than to branches in the
272 This avoids the usual requirement of having to run
276 in order to make incoming changes appear on branches in the
279 But maintaining custom changes in the cloned repository becomes difficult
280 since such changes will be at risk of being discarded whenever incoming
283 Suppress progress reporting output.
284 The same option will be passed to
287 .It Fl R Ar reference
288 In addition to the branches and tags that will be fetched, fetch an arbitrary
290 from the remote repository's
293 This option may be specified multiple times to build a list of additional
297 may either be a path to a specific reference, or a reference namespace
298 which will cause all references in this namespace to be fetched.
300 Each reference will be mapped into the cloned repository's
302 namespace, unless the
304 option is used to mirror references directly into the cloned repository's
309 will refuse to fetch references from the remote repository's
318 to print debugging messages to standard error output.
319 This option will be passed to
322 Multiple -v options increase the verbosity.
330 .Op Fl R Ar reference
331 .Op Fl r Ar repository-path
332 .Op Ar remote-repository
335 Fetch new changes from a remote repository.
337 .Ar remote-repository
341 The remote repository's URL is obtained from the corresponding entry in
345 file of the local repository, as created by
348 By default, any branches configured in
351 .Ar remote-repository
355 is invoked in a work tree then this work tree's current branch will be
356 fetched, too, provided it is present on the server.
357 If no branches to fetch can be found in
359 or via a work tree, or said branches are not found on the server, a branch
360 resolved via the remote repository's HEAD reference will be fetched.
361 This default behaviour can be overridden with the
367 New changes will be stored in a separate pack file downloaded from the server.
368 Optionally, separate pack files stored in the repository can be combined with
371 By default, branch references in the
373 reference namespace will be updated to point at the newly fetched commits.
376 command can then be used to make new changes visible on branches in the
378 namespace, merging incoming changes with the changes on those branches
381 If the repository was created as a mirror with
383 then all branches in the
385 namespace will be updated directly to match the corresponding branches in
386 the remote repository.
387 If those branches contained local commits, these commits will no longer be
388 reachable via a reference and will therefore be at risk of being discarded
389 by Git's garbage collector or
390 .Cm gotadmin cleanup .
391 Maintaining custom changes in a mirror repository is therefore discouraged.
393 In any case, references in the
395 namespace will always be fetched and mapped directly to local references
396 in the same namespace.
403 Fetch all branches from the remote repository's
406 This option can be enabled by default for specific repositories in
408 Cannot be used together with the
414 from the remote repository's
417 This option may be specified multiple times to build a list of branches
419 Cannot be used together with the
423 Delete branches and tags from the local repository which are no longer
424 present in the remote repository.
425 Only references are deleted.
426 Any commit, tree, tag, and blob objects belonging to deleted branches or
427 tags remain in the repository and may be removed separately with
428 Git's garbage collector or
429 .Cm gotadmin cleanup .
431 List branches and tags available for fetching from the remote repository
432 and exit immediately.
433 Cannot be used together with any of the other options except
439 Suppress progress reporting output.
440 The same option will be passed to
443 .It Fl R Ar reference
444 In addition to the branches and tags that will be fetched, fetch an arbitrary
446 from the remote repository's
449 This option may be specified multiple times to build a list of additional
453 may either be a path to a specific reference, or a reference namespace
454 which will cause all references in this namespace to be fetched.
456 Each reference will be mapped into the local repository's
458 namespace, unless the local repository was created as a mirror with
460 in which case references will be mapped directly into the local repository's
464 Once a reference has been fetched, a branch based on it can be created with
469 will refuse to fetch references from the remote repository's
474 .It Fl r Ar repository-path
475 Use the repository at the specified path.
476 If not specified, assume the repository is located at or above the current
478 If this directory is a
480 work tree, use the repository path associated with this work tree.
482 Allow existing references in the
484 namespace to be updated if they have changed on the server.
485 If not specified, only new tag references will be created.
490 to print debugging messages to standard error output.
491 The same option will be passed to
494 Multiple -v options increase the verbosity.
497 Delete all references which correspond to a particular
498 .Ar remote-repository
499 instead of fetching new changes.
500 This can be useful when a remote repository is being removed from
506 .Ar remote-repository
507 argument is mandatory and no other options except
514 Only references are deleted.
515 Any commit, tree, tag, and blob objects fetched from a remote repository
516 will generally be stored in pack files and may be removed separately with
518 and Git's garbage collector.
526 .Op Fl p Ar path-prefix
528 .Op Ar work-tree-path
531 Copy files from a repository into a new work tree.
532 Show the status of each affected file, using the following status codes:
533 .Bl -column YXZ description
534 .It A Ta new file was added
535 .It E Ta file already exists in work tree's meta-data
540 is not specified, either use the last component of
541 .Ar repository path ,
544 was specified use the last component of
552 Check out files from a commit on the specified
554 If this option is not specified, a branch resolved via the repository's HEAD
555 reference will be used.
557 Check out files from the specified
559 on the selected branch.
560 The expected argument is a commit ID SHA1 hash or an existing reference
561 or tag name which will be resolved to a commit ID.
562 An abbreviated hash argument will be expanded to a full SHA1 hash
563 automatically, provided the abbreviation is unique.
564 If this option is not specified, the most recent commit on the selected
569 is not contained in the selected branch, a different branch which contains
570 this commit must be specified with the
573 If no such branch is known, a new branch must be created for this
579 Checking out work trees with an unknown branch is intentionally not supported.
581 Proceed with the checkout operation even if the directory at
584 Existing files will be left intact.
585 .It Fl p Ar path-prefix
586 Restrict the work tree to a subset of the repository's tree hierarchy.
587 Only files beneath the specified
591 Silence progress output.
602 Update an existing work tree to a different
604 Change existing files in the work tree as necessary to match file contents
606 Preserve any local changes in the work tree and merge them with the
609 Files which already contain merge conflicts will not be updated to avoid
610 further complications.
611 Such files will be updated when
613 is run again after merge conflicts have been resolved.
614 If the conflicting changes are no longer needed, affected files can be
621 Show the status of each affected file, using the following status codes:
622 .Bl -column YXZ description
623 .It U Ta file was updated and contained no local changes
624 .It G Ta file was updated and local changes were merged cleanly
625 .It C Ta file was updated and conflicts occurred during merge
626 .It D Ta file was deleted
627 .It A Ta new file was added
628 .It \(a~ Ta versioned file is obstructed by a non-regular file
629 .It ! Ta a missing versioned file was restored
630 .It # Ta file was not updated because it contains merge conflicts
631 .It ? Ta changes destined for an unversioned file were not merged
636 is specified, update the entire work tree.
637 Otherwise, restrict the update operation to files at or within the
639 Each path is required to exist in the update operation's target commit.
640 Files in the work tree outside specified paths will remain unchanged and
641 will retain their previously recorded base commit.
644 commands may refuse to run while the work tree contains files from
645 multiple base commits.
646 The base commit of such a work tree can be made consistent by running
648 across the entire work tree.
651 is incompatible with the
656 cannot update paths with staged changes.
657 If changes have been staged with
659 these changes must first be committed with
669 Switch the work tree's branch reference to the specified
671 before updating the work tree.
672 This option requires that all paths in the work tree are updated.
674 As usual, any local changes in the work tree will be preserved.
675 This can be useful when switching to a newly created branch in order
676 to commit existing local changes to this branch.
678 Any local changes must be dealt with separately in order to obtain a
679 work tree with pristine file contents corresponding exactly to the specified
681 Such changes could first be committed to a different branch with
683 or could be discarded with
686 Update the work tree to the specified
688 The expected argument is a commit ID SHA1 hash or an existing reference
689 or tag name which will be resolved to a commit ID.
690 An abbreviated hash argument will be expanded to a full SHA1 hash
691 automatically, provided the abbreviation is unique.
692 If this option is not specified, the most recent commit on the work tree's
695 Silence progress output.
701 .Op Fl S Ar status-codes
702 .Op Fl s Ar status-codes
706 Show the current modification status of files in a work tree,
707 using the following status codes:
708 .Bl -column YXZ description
709 .It M Ta modified file
710 .It A Ta file scheduled for addition in next commit
711 .It D Ta file scheduled for deletion in next commit
712 .It C Ta modified or added file which contains merge conflicts
713 .It ! Ta versioned file was expected on disk but is missing
714 .It \(a~ Ta versioned file is obstructed by a non-regular file
715 .It ? Ta unversioned item not tracked by
717 .It m Ta modified file modes (executable bit only)
718 .It N Ta non-existent
720 specified on the command line
725 is specified, show modifications in the entire work tree.
726 Otherwise, show modifications at or within the specified paths.
728 If changes have been staged with
730 staged changes are shown in the second output column, using the following
732 .Bl -column YXZ description
733 .It M Ta file modification is staged
734 .It A Ta file addition is staged
735 .It D Ta file deletion is staged
738 Changes created on top of staged changes are indicated in the first column:
739 .Bl -column YXZ description
740 .It MM Ta file was modified after earlier changes have been staged
741 .It MA Ta file was modified after having been staged for addition
749 Show unversioned files even if they match an ignore pattern.
750 .It Fl S Ar status-codes
751 Suppress the output of files with a modification status matching any of the
752 single-character status codes contained in the
755 Any combination of codes from the above list of possible status codes
757 For staged files, status codes displayed in either column will be matched.
758 Cannot be used together with the
761 .It Fl s Ar status-codes
762 Only show files with a modification status matching any of the
763 single-character status codes contained in the
766 Any combination of codes from the above list of possible status codes
768 For staged files, status codes displayed in either column will be matched.
769 Cannot be used together with the
774 For compatibility with
785 files in each traversed directory and will not display unversioned files
786 which match these patterns.
791 supports consecutive asterisks,
793 which will match an arbitrary amount of directories.
797 only supports a single ignore pattern per line.
801 does not support negated ignore patterns prefixed with
803 and gives no special significance to the location of path component separators,
812 .Op Fl r Ar repository-path
813 .Op Fl S Ar search-pattern
817 Display history of a repository.
820 is specified, show only commits which modified this path.
821 If invoked in a work tree, the
823 is interpreted relative to the current working directory,
824 and the work tree's path prefix is implicitly prepended.
825 Otherwise, the path is interpreted relative to the repository root.
832 Display individual commits which were merged into the current branch
836 shows the linear history of the current branch only.
838 Set the number of context lines shown in diffs with
840 By default, 3 lines of context are shown.
842 Start traversing history at the specified
844 The expected argument is a commit ID SHA1 hash or an existing reference
845 or tag name which will be resolved to a commit ID.
846 An abbreviated hash argument will be expanded to a full SHA1 hash
847 automatically, provided the abbreviation is unique.
848 If this option is not specified, default to the work tree's current branch
849 if invoked in a work tree, or to the repository's HEAD reference.
851 Display diffstat of changes introduced in each commit.
852 Cannot be used with the
856 Limit history traversal to a given number of commits.
857 If this option is not specified, a default limit value of zero is used,
858 which is treated as an unbounded limit.
860 .Ev GOT_LOG_DEFAULT_LIMIT
861 environment variable may be set to change this default value.
863 Display the list of file paths changed in each commit, using the following
865 .Bl -column YXZ description
866 .It M Ta modified file
867 .It D Ta file was deleted
868 .It A Ta new file was added
869 .It m Ta modified file modes (executable bit only)
872 Cannot be used with the
876 Display the patch of modifications made in each commit.
879 is specified, only show the patch of modifications at or within this path.
880 Cannot be used with the
884 Determine a set of commits to display as usual, but display these commits
886 .It Fl r Ar repository-path
887 Use the repository at the specified path.
888 If not specified, assume the repository is located at or above the current
890 If this directory is a
892 work tree, use the repository path associated with this work tree.
893 .It Fl S Ar search-pattern
894 If specified, show only commits with a log message, author name,
895 committer name, or ID SHA1 hash matched by the extended regular
898 Lines in committed patches will be matched if
901 File paths changed by a commit will be matched if
904 Regular expression syntax is documented in
907 Display a short one-line summary of each commit, instead of the default
909 Cannot be used together with the
915 Stop traversing commit history immediately after the specified
918 This option has no effect if the specified
928 .Op Fl r Ar repository-path
929 .Op Ar object1 Ar object2 | Ar path ...
932 When invoked within a work tree without any arguments, display all
933 local changes in the work tree.
936 arguments are specified, only show changes within the specified paths.
938 If two arguments are provided, treat each argument as a reference, a tag
939 name, or an object ID SHA1 hash, and display differences between the
940 corresponding objects.
941 Both objects must be of the same type (blobs, trees, or commits).
942 An abbreviated hash argument will be expanded to a full SHA1 hash
943 automatically, provided the abbreviation is unique.
944 If none of these interpretations produce a valid result or if the
949 is running in a work tree, attempt to interpret the two arguments as paths.
956 Treat file contents as ASCII text even if binary data is detected.
958 Set the number of context lines shown in the diff.
959 By default, 3 lines of context are shown.
961 Show differences between commits in the repository.
962 This option may be used up to two times.
963 When used only once, show differences between the specified
965 and its first parent commit.
966 When used twice, show differences between the two specified commits.
968 The expected argument is a commit ID SHA1 hash or an existing reference
969 or tag name which will be resolved to a commit ID.
970 An abbreviated hash argument will be expanded to a full SHA1 hash
971 automatically, provided the abbreviation is unique.
975 option is used, all non-option arguments will be interpreted as paths.
978 arguments are provided, only show differences for the specified paths.
980 Cannot be used together with the
984 Display diffstat of changes before the actual diff by annotating each file path
985 or blob hash being diffed with the total number of lines added and removed.
986 A summary line will display the total number of changes across all files.
988 Interpret all arguments as paths only.
989 This option can be used to resolve ambiguity in cases where paths
990 look like tag names, reference names, or object IDs.
991 This option is only valid when
993 is invoked in a work tree.
994 .It Fl r Ar repository-path
995 Use the repository at the specified path.
996 If not specified, assume the repository is located at or above the current
998 If this directory is a
1000 work tree, use the repository path associated with this work tree.
1002 Show changes staged with
1004 instead of showing local changes in the work tree.
1005 This option is only valid when
1007 is invoked in a work tree.
1009 Ignore whitespace-only changes.
1015 .Op Fl r Ar repository-path
1019 Display line-by-line history of a file at the specified path.
1026 Start traversing history at the specified
1028 The expected argument is a commit ID SHA1 hash or an existing reference
1029 or tag name which will be resolved to a commit ID.
1030 An abbreviated hash argument will be expanded to a full SHA1 hash
1031 automatically, provided the abbreviation is unique.
1032 .It Fl r Ar repository-path
1033 Use the repository at the specified path.
1034 If not specified, assume the repository is located at or above the current
1036 If this directory is a
1038 work tree, use the repository path associated with this work tree.
1045 .Op Fl r Ar repository-path
1049 Display a listing of files and directories at the specified
1050 directory path in the repository.
1051 Entries shown in this listing may carry one of the following trailing
1053 .Bl -column YXZ description
1054 .It @ Ta entry is a symbolic link
1055 .It / Ta entry is a directory
1056 .It * Ta entry is an executable file
1057 .It $ Ta entry is a Git submodule
1060 Symbolic link entries are also annotated with the target path of the link.
1064 is specified, list the repository path corresponding to the current
1065 directory of the work tree, or the root directory of the repository
1066 if there is no work tree.
1073 List files and directories as they appear in the specified
1075 The expected argument is a commit ID SHA1 hash or an existing reference
1076 or tag name which will be resolved to a commit ID.
1077 An abbreviated hash argument will be expanded to a full SHA1 hash
1078 automatically, provided the abbreviation is unique.
1080 Show object IDs of files (blob objects) and directories (tree objects).
1082 Recurse into sub-directories in the repository.
1083 .It Fl r Ar repository-path
1084 Use the repository at the specified path.
1085 If not specified, assume the repository is located at or above the current
1087 If this directory is a
1089 work tree, use the repository path associated with this work tree.
1095 .Op Fl r Ar repository-path
1096 .Op Fl s Ar reference
1099 Manage references in a repository.
1101 References may be listed, created, deleted, and changed.
1102 When creating, deleting, or changing a reference the specified
1104 must be an absolute reference name, i.e. it must begin with
1112 Create a reference or change an existing reference.
1113 The reference with the specified
1115 will point at the specified
1119 argument is a ID SHA1 hash or an existing reference or tag name which will
1120 be resolved to the ID of a corresponding commit, tree, tag, or blob object.
1121 Cannot be used together with any other options except
1124 Delete the reference with the specified
1126 from the repository.
1127 Any commit, tree, tag, and blob objects belonging to deleted references
1128 remain in the repository and may be removed separately with
1129 Git's garbage collector or
1130 .Cm gotadmin cleanup .
1131 Cannot be used together with any other options except
1134 List references in the repository.
1137 is specified, list all existing references in the repository.
1140 is a reference namespace, list all references in this namespace.
1141 Otherwise, show only the reference with the given
1143 Cannot be used together with any other options except
1147 .It Fl r Ar repository-path
1148 Use the repository at the specified path.
1149 If not specified, assume the repository is located at or above the current
1151 If this directory is a
1153 work tree, use the repository path associated with this work tree.
1154 .It Fl s Ar reference
1155 Create a symbolic reference, or change an existing symbolic reference.
1156 The symbolic reference with the specified
1158 will point at the specified
1160 which must already exist in the repository.
1161 Care should be taken not to create loops between references when
1162 this option is used.
1163 Cannot be used together with any other options except
1166 Sort listed references by modification time (most recently modified first)
1167 instead of sorting by lexicographical order.
1168 Use of this option requires the
1170 option to be used as well.
1178 .Op Fl r Ar repository-path
1182 Create, list, or delete branches.
1184 Local branches are managed via references which live in the
1186 reference namespace.
1189 command creates references in this namespace only.
1191 When deleting branches, the specified
1195 reference namespace first.
1196 If no corresponding branch is found, the
1198 namespace will be searched next.
1200 If invoked in a work tree without any arguments, print the name of the
1201 work tree's current branch.
1205 argument is passed, attempt to create a branch reference with the given name.
1206 By default the new branch reference will point at the latest commit on the
1207 work tree's current branch if invoked in a work tree, and otherwise to a commit
1208 resolved via the repository's HEAD reference.
1210 If invoked in a work tree, once the branch was created successfully
1211 switch the work tree's head reference to the newly created branch and
1212 update files across the entire work tree, just like
1213 .Cm got update -b Ar name
1215 Show the status of each affected file, using the following status codes:
1216 .Bl -column YXZ description
1217 .It U Ta file was updated and contained no local changes
1218 .It G Ta file was updated and local changes were merged cleanly
1219 .It C Ta file was updated and conflicts occurred during merge
1220 .It D Ta file was deleted
1221 .It A Ta new file was added
1222 .It \(a~ Ta versioned file is obstructed by a non-regular file
1223 .It ! Ta a missing versioned file was restored
1231 Make a newly created branch reference point at the specified
1235 argument is a commit ID SHA1 hash or an existing reference
1236 or tag name which will be resolved to a commit ID.
1238 Delete the branch with the specified
1244 reference namespace.
1246 Only the branch reference is deleted.
1247 Any commit, tree, and blob objects belonging to the branch
1248 remain in the repository and may be removed separately with
1249 Git's garbage collector or
1250 .Cm gotadmin cleanup .
1252 List all existing branches in the repository, including copies of remote
1253 repositories' branches in the
1255 reference namespace.
1257 If invoked in a work tree, the work tree's current branch is shown
1258 with one the following annotations:
1259 .Bl -column YXZ description
1260 .It * Ta work tree's base commit matches the branch tip
1261 .It \(a~ Ta work tree's base commit is out-of-date
1264 Do not switch and update the work tree after creating a new branch.
1265 .It Fl r Ar repository-path
1266 Use the repository at the specified path.
1267 If not specified, assume the repository is located at or above the current
1269 If this directory is a
1271 work tree, use the repository path associated with this work tree.
1273 Sort listed branches by modification time (most recently modified first)
1274 instead of sorting by lexicographical order.
1277 reference namespace are listed before branches in
1280 Use of this option requires the
1282 option to be used as well.
1289 .Op Fl r Ar repository-path
1290 .Op Fl s Ar signer-id
1293 Manage tags in a repository.
1295 Tags are managed via references which live in the
1297 reference namespace.
1300 command operates on references in this namespace only.
1301 References in this namespace point at tag objects which contain a pointer
1302 to another object, a tag message, as well as author and timestamp information.
1304 Attempt to create a tag with the given
1306 and make this tag point at the given
1308 If no commit is specified, default to the latest commit on the work tree's
1309 current branch if invoked in a work tree, and to a commit resolved via
1310 the repository's HEAD reference otherwise.
1317 Make the newly created tag reference point at the specified
1321 argument is a commit ID SHA1 hash or an existing reference or tag name which
1322 will be resolved to a commit ID.
1323 An abbreviated hash argument will be expanded to a full SHA1 hash
1324 automatically, provided the abbreviation is unique.
1326 List all existing tags in the repository instead of creating a new tag.
1329 argument is passed, show only the tag with the given
1332 Use the specified tag message when creating the new tag.
1337 opens a temporary file in an editor where a tag message can be written.
1338 .It Fl r Ar repository-path
1339 Use the repository at the specified path.
1340 If not specified, assume the repository is located at or above the current
1342 If this directory is a
1344 work tree, use the repository path associated with this work tree.
1345 .It Fl s Ar signer-id
1346 While creating a new tag, sign this tag with the identity given in
1349 For SSH-based signatures,
1351 is the path to a file which may refer to either a private SSH key,
1352 or a public SSH key with the private half available via
1355 will sign the tag object by invoking
1359 command, using the signature namespace
1361 for compatibility with
1364 Verify tag object signatures.
1367 is specified, show and verify the tag object with the provided name.
1368 Otherwise, list all tag objects and verify signatures where present.
1371 verifies SSH-based signatures by invoking
1374 .Fl Y Cm verify Fl f Ar allowed_signers .
1379 otherwise verification is impossible.
1382 During SSH signature creation and verification this option will be passed to
1384 Multiple -v options increase the verbosity.
1390 command will not delete tags or change existing tags.
1391 If a tag must be deleted, the
1393 command may be used to delete a tag's reference.
1394 This should only be done if the tag has not already been copied to
1401 Schedule unversioned files in a work tree for addition to the
1402 repository in the next commit.
1403 By default, files which match a
1405 ignore pattern will not be added.
1412 Add files even if they match a
1416 Permit recursion into directories.
1417 If this option is not specified,
1419 will refuse to run if a specified
1427 .Op Fl s Ar status-codes
1431 Remove versioned files from a work tree and schedule them for deletion
1432 from the repository in the next commit.
1439 Perform the operation even if a file contains local modifications,
1440 and do not raise an error if a specified
1442 does not exist on disk.
1444 Keep affected files on disk.
1446 Permit recursion into directories.
1447 If this option is not specified,
1449 will refuse to run if a specified
1452 .It Fl s Ar status-codes
1453 Only delete files with a modification status matching one of the
1454 single-character status codes contained in the
1457 The following status codes may be specified:
1458 .Bl -column YXZ description
1459 .It M Ta modified file (this implies the
1462 .It ! Ta versioned file expected on disk but missing
1470 .Op Fl p Ar strip-count
1476 to files in a work tree.
1477 Files added or removed by a patch will be scheduled for addition or removal in
1480 The patch must be in the unified diff format as produced by
1487 diff when invoked with their
1492 argument is provided, read unified diff data from standard input instead.
1496 contains multiple patches, then attempt to apply each of them in sequence.
1498 Show the status of each affected file, using the following status codes:
1499 .Bl -column XYZ description
1500 .It M Ta file was modified
1501 .It G Ta file was merged using a merge-base found in the repository
1502 .It C Ta file was merged and conflicts occurred during merge
1503 .It D Ta file was deleted
1504 .It A Ta file was added
1505 .It # Ta failed to patch the file
1508 If a change does not match at its exact line number, attempt to
1509 apply it somewhere else in the file if a good spot can be found.
1510 Otherwise, the patch will fail to apply.
1514 will refuse to apply a patch if certain preconditions are not met.
1515 Files to be deleted must already be under version control, and must
1516 not have been scheduled for deletion already.
1517 Files to be added must not yet be under version control and must not
1518 already be present on disk.
1519 Files to be modified must already be under version control and may not
1520 contain conflict markers.
1522 If an error occurs, the
1524 operation will be aborted.
1525 Any changes made to the work tree up to this point will be left behind.
1526 Such changes can be viewed with
1528 and can be reverted with
1537 Attempt to locate files within the specified
1539 for use as a merge-base for 3-way merges.
1540 Ideally, the specified
1542 should contain versions of files which the changes contained in the
1545 Files will be located by path, relative to the repository root.
1548 option is used then leading path components will be stripped
1549 before paths are looked up in the repository.
1553 option is not used then
1555 will attempt to locate merge-bases via object IDs found in
1557 meta-data, such as produced by
1563 option is only recommended in the absence of such meta-data.
1565 In case no merge-base is available for a file, changes will be applied
1566 without doing a 3-way merge.
1567 Changes which do not apply cleanly may then be rejected entirely, rather
1568 than producing merge conflicts in the patched target file.
1570 Do not make any modifications to the work tree.
1571 This can be used to check whether a patch would apply without issues.
1574 contains diffs that affect the same file multiple times, the results
1575 displayed may be incorrect.
1576 .It Fl p Ar strip-count
1577 Specify the number of leading path components to strip from paths
1586 path prefixes generated by
1588 will be recognized and stripped automatically.
1590 Reverse the patch before applying it.
1596 .Op Fl F Ar response-script
1600 Revert any local changes in files at the specified paths in a work tree.
1601 File contents will be overwritten with those contained in the
1602 work tree's base commit.
1603 There is no way to bring discarded changes back after
1606 If a file was added with
1608 it will become an unversioned file again.
1609 If a file was deleted with
1611 it will be restored.
1617 .It Fl F Ar response-script
1625 responses line-by-line from the specified
1627 file instead of prompting interactively.
1629 Instead of reverting all changes in files, interactively select or reject
1630 changes to revert based on
1636 (quit reverting this file) responses.
1637 If a file is in modified status, individual patches derived from the
1638 modified file content can be reverted.
1639 Files in added or deleted status may only be reverted in their entirety.
1641 Permit recursion into directories.
1642 If this option is not specified,
1644 will refuse to run if a specified
1658 Create a new commit in the repository from changes in a work tree
1659 and use this commit as the new base commit for the work tree.
1662 is specified, commit all changes in the work tree.
1663 Otherwise, commit changes at or within the specified paths.
1665 If changes have been explicitly staged for commit with
1667 only commit staged changes and reject any specified paths which
1668 have not been staged.
1671 opens a temporary file in an editor where a log message can be written
1679 options are used together.
1681 Show the status of each affected file, using the following status codes:
1682 .Bl -column YXZ description
1683 .It M Ta modified file
1684 .It D Ta file was deleted
1685 .It A Ta new file was added
1686 .It m Ta modified file modes (executable bit only)
1689 Files which are not part of the new commit will retain their previously
1690 recorded base commit.
1693 commands may refuse to run while the work tree contains files from
1694 multiple base commits.
1695 The base commit of such a work tree can be made consistent by running
1697 across the entire work tree.
1701 command requires the
1703 environment variable to be set,
1704 unless an author has been configured in
1710 configuration settings can be
1711 obtained from the repository's
1713 file or from Git's global
1722 Set author information in the newly created commit to
1724 This is useful when committing changes on behalf of someone else.
1727 argument must use the same format as the
1729 environment variable.
1731 In addition to storing author information, the newly created commit
1734 information which is obtained, as usual, from the
1736 environment variable, or
1738 or Git configuration settings.
1740 Use the prepared log message stored in the file found at
1742 when creating the new commit.
1744 opens a temporary file in an editor where the prepared log message can be
1745 reviewed and edited further if needed.
1746 Cannot be used together with the
1750 Use the specified log message when creating the new commit.
1751 Cannot be used together with the
1755 This option prevents
1757 from opening the commit message in an editor.
1758 It has no effect unless it is used together with the
1760 option and is intended for non-interactive use such as scripting.
1762 This option prevents
1764 from generating a diff of the to-be-committed changes in a temporary file
1765 which can be viewed while editing a commit message.
1767 Allow the addition of symbolic links which point outside of the path space
1768 that is under version control.
1771 will reject such symbolic links due to safety concerns.
1774 may decide to represent such a symbolic link as a regular file which contains
1775 the link's target path, rather than creating an actual symbolic link which
1776 points outside of the work tree.
1777 Use of this option is discouraged because external mechanisms such as
1779 are better suited for managing symbolic links to paths not under
1784 will refuse to run if certain preconditions are not met.
1785 If the work tree's current branch is not in the
1787 reference namespace, new commits may not be created on this branch.
1788 Local changes may only be committed if they are based on file content
1789 found in the most recent commit on the work tree's branch.
1790 If a path is found to be out of date,
1792 must be used first in order to merge local changes with changes made
1800 .Op Fl r Ar repository-path
1802 .Op Ar remote-repository
1805 Send new changes to a remote repository.
1807 .Ar remote-repository
1811 The remote repository's URL is obtained from the corresponding entry in
1815 file of the local repository, as created by
1818 All objects corresponding to new changes will be written to a temporary
1819 pack file which is then uploaded to the server.
1820 Upon success, references in the
1822 reference namespace of the local repository will be updated to point at
1823 the commits which have been sent.
1825 By default, changes will only be sent if they are based on up-to-date
1826 copies of relevant branches in the remote repository.
1827 If any changes to be sent are based on out-of-date copies or would
1828 otherwise break linear history of existing branches, new changes must
1829 be fetched from the server with
1831 and local branches must be rebased with
1838 option can be used to make exceptions to these requirements.
1845 Send all branches from the local repository's
1847 reference namespace.
1850 option is equivalent to listing all branches with multiple
1853 Cannot be used together with the
1859 from the local repository's
1861 reference namespace.
1862 This option may be specified multiple times to build a list of branches
1864 If this option is not specified, default to the work tree's current branch
1865 if invoked in a work tree, or to the repository's HEAD reference.
1866 Cannot be used together with the
1870 Delete the specified
1872 from the remote repository's
1874 reference namespace.
1875 This option may be specified multiple times to build a list of branches
1878 Only references are deleted.
1879 Any commit, tree, tag, and blob objects belonging to deleted branches
1880 may become subject to deletion by Git's garbage collector running on
1883 Requesting deletion of branches results in an error if the server
1884 does not support this feature or disallows the deletion of branches
1885 based on its configuration.
1887 Attempt to force the server to overwrite existing branches or tags
1888 in the remote repository, even when
1892 would usually be required before changes can be sent.
1893 The server may reject forced requests regardless, depending on its
1896 Any commit, tree, tag, and blob objects belonging to overwritten branches
1897 or tags may become subject to deletion by Git's garbage collector running
1902 reference namespace is globally shared between all repositories.
1905 option to overwrite tags is discouraged because it can lead to
1906 inconsistencies between the tags present in different repositories.
1907 In general, creating a new tag with a different name is recommended
1908 instead of overwriting an existing tag.
1912 option is particularly discouraged if changes being sent are based
1913 on an out-of-date copy of a branch in the remote repository.
1914 Instead of using the
1916 option, new changes should
1919 and local branches should be rebased with
1921 followed by another attempt to send the changes.
1925 option should only be needed in situations where the remote repository's
1926 copy of a branch or tag is known to be out-of-date and is considered
1928 The risks of creating inconsistencies between different repositories
1929 should also be taken into account.
1931 Suppress progress reporting output.
1932 The same option will be passed to
1935 .It Fl r Ar repository-path
1936 Use the repository at the specified path.
1937 If not specified, assume the repository is located at or above the current
1939 If this directory is a
1941 work tree, use the repository path associated with this work tree.
1943 Attempt to send all tags from the local repository's
1945 reference namespace.
1948 option is equivalent to listing all tags with multiple
1951 Cannot be used together with the
1957 from the local repository's
1959 reference namespace, in addition to any branches that are being sent.
1962 option may be specified multiple times to build a list of tags to send.
1963 No tags will be sent if the
1967 Raise an error if the specified
1969 already exists in the remote repository, unless the
1971 option is used to overwrite the server's copy of the tag.
1972 In general, creating a new tag with a different name is recommended
1973 instead of overwriting an existing tag.
1975 Cannot be used together with the
1982 to print debugging messages to standard error output.
1983 The same option will be passed to
1986 Multiple -v options increase the verbosity.
1996 Merge changes from a single
2001 should be on a different branch than the work tree's base commit.
2002 The expected argument is a reference or a commit ID SHA1 hash.
2003 An abbreviated hash argument will be expanded to a full SHA1 hash
2004 automatically, provided the abbreviation is unique.
2006 Show the status of each affected file, using the following status codes:
2007 .Bl -column YXZ description
2008 .It G Ta file was merged
2009 .It C Ta file was merged and conflicts occurred during merge
2010 .It ! Ta changes destined for a missing file were not merged
2011 .It D Ta file was deleted
2012 .It d Ta file's deletion was prevented by local modifications
2013 .It A Ta new file was added
2014 .It \(a~ Ta changes destined for a non-regular file were not merged
2015 .It ? Ta changes destined for an unversioned file were not merged
2018 The merged changes will appear as local changes in the work tree, which
2021 amended manually or with further
2027 If invoked in a work tree where no
2032 operation is taking place,
2034 creates a record of commits which have been merged into the work tree.
2035 When a file changed by
2039 the log messages of relevant merged commits will then appear in the editor,
2040 where the messages should be further adjusted to convey the reasons for
2041 cherrypicking the changes.
2042 Upon exiting the editor, if the time stamp of the log message file
2043 is unchanged or the log message is empty,
2045 will fail with an unmodified or empty log message error.
2047 If all the changes in all files touched by a given commit are discarded,
2050 this commit's log message record will also disappear.
2053 will refuse to run if certain preconditions are not met.
2054 If the work tree contains multiple base commits, it must first be updated
2055 to a single base commit with
2057 If any relevant files already contain merge conflicts, these
2058 conflicts must be resolved first.
2066 Display a list of commit log messages recorded by cherrypick operations,
2067 represented by references in the
2068 .Dq refs/got/worktree
2069 reference namespace.
2072 is specified, only show the log message of the specified commit.
2074 If invoked in a work tree, only log messages recorded by cherrypick operations
2075 in the current work tree will be displayed.
2076 Otherwise, all commit log messages will be displayed irrespective of the
2077 work tree in which they were created.
2078 This option cannot be used with
2081 Delete log messages created by previous cherrypick operations, represented by
2083 .Dq refs/got/worktree
2084 reference namespace.
2087 is specified, only delete the log message of the specified commit.
2089 If invoked in a work tree, only log messages recorded by cherrypick operations
2090 in the current work tree will be deleted.
2091 Otherwise, all commit log messages will be deleted irrespective of the
2092 work tree in which they were created.
2093 This option cannot be used with
2104 Reverse-merge changes from a single
2109 should be on the same branch as the work tree's base commit.
2110 The expected argument is a reference or a commit ID SHA1 hash.
2111 An abbreviated hash argument will be expanded to a full SHA1 hash
2112 automatically, provided the abbreviation is unique.
2114 Show the status of each affected file, using the following status codes:
2115 .Bl -column YXZ description
2116 .It G Ta file was merged
2117 .It C Ta file was merged and conflicts occurred during merge
2118 .It ! Ta changes destined for a missing file were not merged
2119 .It D Ta file was deleted
2120 .It d Ta file's deletion was prevented by local modifications
2121 .It A Ta new file was added
2122 .It \(a~ Ta changes destined for a non-regular file were not merged
2123 .It ? Ta changes destined for an unversioned file were not merged
2126 The reverse-merged changes will appear as local changes in the work tree,
2127 which may be viewed with
2129 amended manually or with further
2135 If invoked in a work tree where no
2140 operation is taking place,
2142 creates a record of commits which have been reverse-merged into the work tree.
2143 When a file changed by
2147 the log messages of relevant reverse-merged commits will then appear in
2148 the editor, where the messages should be further adjusted to convey the
2149 reasons for backing out the changes.
2150 Upon exiting the editor, if the time stamp of the log message file
2151 is unchanged or the log message is empty,
2153 will fail with an unmodified or empty log message error.
2155 If all the changes in all files touched by a given commit are discarded,
2158 this commit's log message record will also disappear.
2161 will refuse to run if certain preconditions are not met.
2162 If the work tree contains multiple base commits, it must first be updated
2163 to a single base commit with
2165 If any relevant files already contain merge conflicts, these
2166 conflicts must be resolved first.
2174 Display a list of commit log messages recorded by backout operations,
2175 represented by references in the
2176 .Dq refs/got/worktree
2177 reference namespace.
2180 is specified, only show the log message of the specified commit.
2182 If invoked in a work tree, only log messages recorded by backout operations
2183 in the current work tree will be displayed.
2184 Otherwise, all commit log messages will be displayed irrespective of the
2185 work tree in which they were created.
2186 This option cannot be used with
2189 Delete log messages created by previous backout operations, represented by
2191 .Dq refs/got/worktree
2192 reference namespace.
2195 is specified, only delete the log message of the specified commit.
2197 If invoked in a work tree, only log messages recorded by backout operations
2198 in the current work tree will be deleted.
2199 Otherwise, all commit log messages will be deleted irrespective of the
2200 work tree in which they were created.
2201 This option cannot be used with
2212 Rebase commits on the specified
2214 onto the tip of the current branch of the work tree.
2217 must share common ancestry with the work tree's current branch.
2218 Rebasing begins with the first descendant commit of the youngest
2219 common ancestor commit shared by the specified
2221 and the work tree's current branch, and stops once the tip commit
2228 is used as intended, the specified
2230 represents a local commit history and may already contain changes
2231 that are not yet visible in any other repositories.
2232 The work tree's current branch, which must be set with
2236 operation, represents a branch from a remote repository which shares
2237 a common history with the specified
2239 but has progressed, and perhaps diverged, due to commits added to the
2242 Rebased commits are accumulated on a temporary branch which the work tree
2243 will remain switched to throughout the entire rebase operation.
2244 Commits on this branch represent the same changes with the same log
2245 messages as their counterparts on the original
2247 but with different commit IDs.
2248 Once rebasing has completed successfully, the temporary branch becomes
2249 the new version of the specified
2251 and the work tree is automatically switched to it.
2252 If author information is available via the
2254 environment variable,
2260 configuration settings, this author information will be used to identify
2265 Old commits in their pre-rebase state are automatically backed up in the
2266 .Dq refs/got/backup/rebase
2267 reference namespace.
2268 As long as these references are not removed older versions of rebased
2269 commits will remain in the repository and can be viewed with the
2272 Removal of these references makes objects which become unreachable via
2273 any reference subject to removal by Git's garbage collector or
2274 .Cm gotadmin cleanup .
2276 While rebasing commits, show the status of each affected file,
2277 using the following status codes:
2278 .Bl -column YXZ description
2279 .It G Ta file was merged
2280 .It C Ta file was merged and conflicts occurred during merge
2281 .It ! Ta changes destined for a missing file were not merged
2282 .It D Ta file was deleted
2283 .It d Ta file's deletion was prevented by local modifications
2284 .It A Ta new file was added
2285 .It \(a~ Ta changes destined for a non-regular file were not merged
2286 .It ? Ta changes destined for an unversioned file were not merged
2289 If merge conflicts occur, the rebase operation is interrupted and may
2290 be continued once conflicts have been resolved.
2291 If any files with destined changes are found to be missing or unversioned,
2292 or if files could not be deleted due to differences in deleted content,
2293 the rebase operation will be interrupted to prevent potentially incomplete
2294 changes from being committed to the repository without user intervention.
2295 The work tree may be modified as desired and the rebase operation can be
2296 continued once the changes present in the work tree are considered complete.
2297 Alternatively, the rebase operation may be aborted which will leave
2299 unmodified and the work tree switched back to its original branch.
2301 If a merge conflict is resolved in a way which renders the merged
2302 change into a no-op change, the corresponding commit will be elided
2303 when the rebase operation continues.
2306 will refuse to run if certain preconditions are not met.
2311 reference namespace, the branch may not be rebased.
2312 If the work tree is not yet fully updated to the tip commit of its
2313 branch, then the work tree must first be updated with
2315 If changes have been staged with
2317 these changes must first be committed with
2321 If the work tree contains local changes, these changes must first be
2328 contains changes to files outside of the work tree's path prefix,
2329 the work tree cannot be used to rebase this branch.
2338 commands will refuse to run while a rebase operation is in progress.
2339 Other commands which manipulate the work tree may be used for
2340 conflict resolution purposes.
2344 is already based on the work tree's current branch, then no commits
2345 need to be rebased and
2347 will simply switch the work tree to the specified
2349 and update files in the work tree accordingly.
2356 Abort an interrupted rebase operation.
2357 If this option is used, no other command-line arguments are allowed.
2359 Continue an interrupted rebase operation.
2360 If this option is used, no other command-line arguments are allowed.
2362 Show a list of past rebase operations, represented by references in the
2363 .Dq refs/got/backup/rebase
2364 reference namespace.
2366 Display the author, date, and log message of each backed up commit,
2367 the object ID of the corresponding post-rebase commit, and
2368 the object ID of their common ancestor commit.
2369 Given these object IDs,
2376 options can be used to examine the history of either version of the branch,
2381 option can be used to create a new branch from a pre-rebase state if desired.
2385 is specified, only show commits which at some point in time represented this
2387 Otherwise, list all backed up commits for any branches.
2389 If this option is used,
2391 does not require a work tree.
2392 None of the other options can be used together with
2395 Delete backups created by past rebase operations, represented by references
2397 .Dq refs/got/backup/rebase
2398 reference namespace.
2402 is specified, only delete backups which at some point in time represented
2404 Otherwise, delete all references found within
2405 .Dq refs/got/backup/rebase .
2407 Any commit, tree, tag, and blob objects belonging to deleted backups
2408 remain in the repository and may be removed separately with
2409 Git's garbage collector or
2410 .Cm gotadmin cleanup .
2412 If this option is used,
2414 does not require a work tree.
2415 None of the other options can be used together with
2422 .Op Fl F Ar histedit-script
2426 Edit commit history between the work tree's current base commit and
2427 the tip commit of the work tree's current branch.
2431 command requires the
2433 environment variable to be set,
2434 unless an author has been configured in
2440 configuration settings can be obtained from the repository's
2442 file or from Git's global
2448 operation, the work tree's current branch must be set with
2450 to the branch which should be edited, unless this branch is already the
2451 current branch of the work tree.
2452 The tip of this branch represents the upper bound (inclusive) of commits
2457 Furthermore, the work tree's base commit
2460 to a point in this branch's commit history where editing should begin.
2461 This commit represents the lower bound (non-inclusive) of commits touched
2466 Editing of commit history is controlled via a
2468 which can be written in an editor based on a template, passed on the
2469 command line, or generated with the
2475 The format of the histedit script is line-based.
2476 Each line in the script begins with a command name, followed by
2477 whitespace and an argument.
2478 For most commands, the expected argument is a commit ID SHA1 hash.
2479 Any remaining text on the line is ignored.
2480 Lines which begin with the
2482 character are ignored entirely.
2484 The available histedit script commands are as follows:
2485 .Bl -column YXZ pick-commit
2486 .It Cm pick Ar commit Ta Use the specified commit as it is.
2487 .It Cm edit Ar commit Ta Use the specified commit but once changes have been
2488 merged into the work tree interrupt the histedit operation for amending.
2489 .It Cm fold Ar commit Ta Combine the specified commit with the next commit
2490 listed further below that will be used.
2491 .It Cm drop Ar commit Ta Remove this commit from the edited history.
2492 .It Cm mesg Oo Ar log-message Oc Ta Create a new log message for the commit of
2497 command on the previous line of the histedit script.
2500 argument provides a new single-line log message to use.
2503 argument is omitted, open an editor where a new log message can be written.
2506 Every commit in the history being edited must be mentioned in the script.
2507 Lines may be re-ordered to change the order of commits in the edited history.
2508 No commit may be listed more than once.
2510 Edited commits are accumulated on a temporary branch which the work tree
2511 will remain switched to throughout the entire histedit operation.
2512 Once history editing has completed successfully, the temporary branch becomes
2513 the new version of the work tree's branch and the work tree is automatically
2516 Old commits in their pre-histedit state are automatically backed up in the
2517 .Dq refs/got/backup/histedit
2518 reference namespace.
2519 As long as these references are not removed older versions of edited
2520 commits will remain in the repository and can be viewed with the
2523 Removal of these references makes objects which become unreachable via
2524 any reference subject to removal by Git's garbage collector or
2525 .Cm gotadmin cleanup .
2527 While merging commits, show the status of each affected file,
2528 using the following status codes:
2529 .Bl -column YXZ description
2530 .It G Ta file was merged
2531 .It C Ta file was merged and conflicts occurred during merge
2532 .It ! Ta changes destined for a missing file were not merged
2533 .It D Ta file was deleted
2534 .It d Ta file's deletion was prevented by local modifications
2535 .It A Ta new file was added
2536 .It \(a~ Ta changes destined for a non-regular file were not merged
2537 .It ? Ta changes destined for an unversioned file were not merged
2540 If merge conflicts occur, the histedit operation is interrupted and may
2541 be continued once conflicts have been resolved.
2542 If any files with destined changes are found to be missing or unversioned,
2543 or if files could not be deleted due to differences in deleted content,
2544 the histedit operation will be interrupted to prevent potentially incomplete
2545 changes from being committed to the repository without user intervention.
2546 The work tree may be modified as desired and the histedit operation can be
2547 continued once the changes present in the work tree are considered complete.
2548 Alternatively, the histedit operation may be aborted which will leave
2549 the work tree switched back to its original branch.
2551 If a merge conflict is resolved in a way which renders the merged
2552 change into a no-op change, the corresponding commit will be elided
2553 when the histedit operation continues.
2556 will refuse to run if certain preconditions are not met.
2557 If the work tree's current branch is not in the
2559 reference namespace, the history of the branch may not be edited.
2560 If the work tree contains multiple base commits, it must first be updated
2561 to a single base commit with
2563 If changes have been staged with
2565 these changes must first be committed with
2569 If the work tree contains local changes, these changes must first be
2574 If the edited history contains changes to files outside of the work tree's
2575 path prefix, the work tree cannot be used to edit the history of this branch.
2583 commands will refuse to run while a histedit operation is in progress.
2584 Other commands which manipulate the work tree may be used, and the
2586 command may be used to commit arbitrary changes to the temporary branch
2587 while the histedit operation is interrupted.
2594 Abort an interrupted histedit operation.
2595 If this option is used, no other command-line arguments are allowed.
2597 Continue an interrupted histedit operation.
2598 If this option is used, no other command-line arguments are allowed.
2601 This option is a quick equivalent to a histedit script which drops all
2605 option can only be used when starting a new histedit operation.
2606 If this option is used, no other command-line arguments are allowed.
2608 Interrupt the histedit operation for editing after merging each commit.
2609 This option is a quick equivalent to a histedit script which uses the
2611 command for all commits.
2614 option can only be used when starting a new histedit operation.
2615 If this option is used, no other command-line arguments are allowed.
2616 .It Fl F Ar histedit-script
2619 instead of opening a temporary file in an editor where a histedit script
2622 Fold all commits into a single commit.
2623 This option is a quick equivalent to a histedit script which folds all
2624 commits, combining them all into one commit.
2627 option can only be used when starting a new histedit operation.
2628 If this option is used, no other command-line arguments are allowed.
2630 Show a list of past histedit operations, represented by references in the
2631 .Dq refs/got/backup/histedit
2632 reference namespace.
2634 Display the author, date, and log message of each backed up commit,
2635 the object ID of the corresponding post-histedit commit, and
2636 the object ID of their common ancestor commit.
2637 Given these object IDs,
2644 options can be used to examine the history of either version of the branch,
2649 option can be used to create a new branch from a pre-histedit state if desired.
2653 is specified, only show commits which at some point in time represented this
2655 Otherwise, list all backed up commits for any branches.
2657 If this option is used,
2659 does not require a work tree.
2660 None of the other options can be used together with
2663 Edit log messages only.
2664 This option is a quick equivalent to a histedit script which edits
2665 only log messages but otherwise leaves every picked commit as-is.
2668 option can only be used when starting a new histedit operation.
2669 If this option is used, no other command-line arguments are allowed.
2671 Delete backups created by past histedit operations, represented by references
2673 .Dq refs/got/backup/histedit
2674 reference namespace.
2678 is specified, only delete backups which at some point in time represented
2680 Otherwise, delete all references found within
2681 .Dq refs/got/backup/histedit .
2683 Any commit, tree, tag, and blob objects belonging to deleted backups
2684 remain in the repository and may be removed separately with
2685 Git's garbage collector or
2686 .Cm gotadmin cleanup .
2688 If this option is used,
2690 does not require a work tree.
2691 None of the other options can be used together with
2695 .It Cm integrate Ar branch
2697 Integrate the specified
2699 into the work tree's current branch.
2700 Files in the work tree are updated to match the contents on the integrated
2702 and the reference of the work tree's branch is changed to point at the
2703 head commit of the integrated
2706 Both branches can be considered equivalent after integration since they
2707 will be pointing at the same commit.
2708 Both branches remain available for future work, if desired.
2709 In case the integrated
2711 is no longer needed it may be deleted with
2714 Show the status of each affected file, using the following status codes:
2715 .Bl -column YXZ description
2716 .It U Ta file was updated
2717 .It D Ta file was deleted
2718 .It A Ta new file was added
2719 .It \(a~ Ta versioned file is obstructed by a non-regular file
2720 .It ! Ta a missing versioned file was restored
2724 will refuse to run if certain preconditions are not met.
2725 Most importantly, the
2727 must have been rebased onto the work tree's current branch with
2729 before it can be integrated, in order to linearize commit history and
2730 resolve merge conflicts.
2731 If the work tree contains multiple base commits, it must first be updated
2732 to a single base commit with
2734 If changes have been staged with
2736 these changes must first be committed with
2740 If the work tree contains local changes, these changes must first be
2752 Create a merge commit based on the current branch of the work tree and
2755 If a linear project history is desired, then use of
2757 should be preferred over
2759 However, even strictly linear projects may require merge commits in order
2760 to merge in new versions of third-party code stored on vendor branches
2764 Merge commits are commits based on multiple parent commits.
2765 The tip commit of the work tree's current branch, which must be set with
2769 operation, will be used as the first parent.
2770 The tip commit of the specified
2772 will be used as the second parent.
2774 No ancestral relationship between the two branches is required.
2775 If the two branches have already been merged previously, only new changes
2778 It is not possible to create merge commits with more than two parents.
2779 If more than one branch needs to be merged, then multiple merge commits
2780 with two parents each can be created in sequence.
2782 While merging changes found on the
2784 into the work tree, show the status of each affected file,
2785 using the following status codes:
2786 .Bl -column YXZ description
2787 .It G Ta file was merged
2788 .It C Ta file was merged and conflicts occurred during merge
2789 .It ! Ta changes destined for a missing file were not merged
2790 .It D Ta file was deleted
2791 .It d Ta file's deletion was prevented by local modifications
2792 .It A Ta new file was added
2793 .It \(a~ Ta changes destined for a non-regular file were not merged
2794 .It ? Ta changes destined for an unversioned file were not merged
2797 If merge conflicts occur, the merge operation is interrupted and conflicts
2798 must be resolved before the merge operation can continue.
2799 If any files with destined changes are found to be missing or unversioned,
2800 or if files could not be deleted due to differences in deleted content,
2801 the merge operation will be interrupted to prevent potentially incomplete
2802 changes from being committed to the repository without user intervention.
2803 The work tree may be modified as desired and the merge can be continued
2804 once the changes present in the work tree are considered complete.
2805 Alternatively, the merge operation may be aborted which will leave
2806 the work tree's current branch unmodified.
2808 If a merge conflict is resolved in a way which renders all merged
2809 changes into no-op changes, the merge operation cannot continue
2810 and must be aborted.
2813 will refuse to run if certain preconditions are not met.
2816 is based on the work tree's current branch, then no merge commit can
2819 may be used to integrate the
2822 If the work tree is not yet fully updated to the tip commit of its
2823 branch, then the work tree must first be updated with
2825 If the work tree contains multiple base commits, it must first be updated
2826 to a single base commit with
2828 If changes have been staged with
2830 these changes must first be committed with
2834 If the work tree contains local changes, these changes must first be
2841 contains changes to files outside of the work tree's path prefix,
2842 the work tree cannot be used to merge this branch.
2852 commands will refuse to run while a merge operation is in progress.
2853 Other commands which manipulate the work tree may be used for
2854 conflict resolution purposes.
2861 Abort an interrupted merge operation.
2862 If this option is used, no other command-line arguments are allowed.
2864 Continue an interrupted merge operation.
2865 If this option is used, no other command-line arguments are allowed.
2867 Merge changes into the work tree as usual but do not create a merge
2869 The merge result can be adjusted as desired before a merge commit is
2872 Alternatively, the merge may be aborted with
2879 .Op Fl F Ar response-script
2883 Stage local changes for inclusion in the next commit.
2886 is specified, stage all changes in the work tree.
2887 Otherwise, stage changes at or within the specified paths.
2888 Paths may be staged if they are added, modified, or deleted according to
2891 Show the status of each affected file, using the following status codes:
2892 .Bl -column YXZ description
2893 .It A Ta file addition has been staged
2894 .It M Ta file modification has been staged
2895 .It D Ta file deletion has been staged
2898 Staged file contents are saved in newly created blob objects in the repository.
2899 These blobs will be referred to by tree objects once staged changes have been
2902 Staged changes affect the behaviour of
2907 While paths with staged changes exist, the
2909 command will refuse to commit any paths which do not have staged changes.
2910 Local changes created on top of staged changes can only be committed if
2911 the path is staged again, or if the staged changes are committed first.
2914 command will show both local changes and staged changes.
2917 command is able to display local changes relative to staged changes,
2918 and to display staged changes relative to the repository.
2921 command cannot revert staged changes but may be used to revert
2922 local changes created on top of staged changes.
2928 .It Fl F Ar response-script
2936 responses line-by-line from the specified
2938 file instead of prompting interactively.
2940 Instead of staging new changes, list paths which are already staged,
2941 along with the IDs of staged blob objects and stage status codes.
2942 If paths were provided on the command line, show the staged paths
2943 among the specified paths.
2944 Otherwise, show all staged paths.
2946 Instead of staging the entire content of a changed file, interactively
2947 select or reject changes for staging based on
2951 (reject change), and
2953 (quit staging this file) responses.
2954 If a file is in modified status, individual patches derived from the
2955 modified file content can be staged.
2956 Files in added or deleted status may only be staged or rejected in
2959 Allow staging of symbolic links which point outside of the path space
2960 that is under version control.
2963 will reject such symbolic links due to safety concerns.
2966 may decide to represent such a symbolic link as a regular file which contains
2967 the link's target path, rather than creating an actual symbolic link which
2968 points outside of the work tree.
2969 Use of this option is discouraged because external mechanisms such as
2971 are better suited for managing symbolic links to paths not under
2976 will refuse to run if certain preconditions are not met.
2977 If a file contains merge conflicts, these conflicts must be resolved first.
2978 If a file is found to be out of date relative to the head commit on the
2979 work tree's current branch, the file must be updated with
2981 before it can be staged (however, this does not prevent the file from
2982 becoming out-of-date at some point after having been staged).
2989 commands will refuse to run while staged changes exist.
2990 If staged changes cannot be committed because a staged path
2991 is out of date, the path must be unstaged with
2993 before it can be updated with
2995 and may then be staged again if necessary.
3000 .Op Fl F Ar response-script
3004 Merge staged changes back into the work tree and put affected paths
3005 back into non-staged status.
3008 is specified, unstage all staged changes across the entire work tree.
3009 Otherwise, unstage changes at or within the specified paths.
3011 Show the status of each affected file, using the following status codes:
3012 .Bl -column YXZ description
3013 .It G Ta file was unstaged
3014 .It C Ta file was unstaged and conflicts occurred during merge
3015 .It ! Ta changes destined for a missing file were not merged
3016 .It D Ta file was staged as deleted and still is deleted
3017 .It d Ta file's deletion was prevented by local modifications
3018 .It \(a~ Ta changes destined for a non-regular file were not merged
3025 .It Fl F Ar response-script
3033 responses line-by-line from the specified
3035 file instead of prompting interactively.
3037 Instead of unstaging the entire content of a changed file, interactively
3038 select or reject changes for unstaging based on
3042 (keep change staged), and
3044 (quit unstaging this file) responses.
3045 If a file is staged in modified status, individual patches derived from the
3046 staged file content can be unstaged.
3047 Files staged in added or deleted status may only be unstaged in their entirety.
3053 .Op Fl r Ar repository-path
3056 Parse and print contents of objects to standard output in a line-based
3058 Content of commit, tree, and tag objects is printed in a way similar
3059 to the actual content stored in such objects.
3060 Blob object contents are printed as they would appear in files on disk.
3062 Attempt to interpret each argument as a reference, a tag name, or
3063 an object ID SHA1 hash.
3064 References will be resolved to an object ID.
3065 Tag names will resolved to a tag object.
3066 An abbreviated hash argument will be expanded to a full SHA1 hash
3067 automatically, provided the abbreviation is unique.
3069 If none of the above interpretations produce a valid result, or if the
3071 option is used, attempt to interpret the argument as a path which will
3072 be resolved to the ID of an object found at this path in the repository.
3079 Look up paths in the specified
3081 If this option is not used, paths are looked up in the commit resolved
3082 via the repository's HEAD reference.
3083 The expected argument is a commit ID SHA1 hash or an existing reference
3084 or tag name which will be resolved to a commit ID.
3085 An abbreviated hash argument will be expanded to a full SHA1 hash
3086 automatically, provided the abbreviation is unique.
3088 Interpret all arguments as paths only.
3089 This option can be used to resolve ambiguity in cases where paths
3090 look like tag names, reference names, or object IDs.
3091 .It Fl r Ar repository-path
3092 Use the repository at the specified path.
3093 If not specified, assume the repository is located at or above the current
3095 If this directory is a
3097 work tree, use the repository path associated with this work tree.
3099 .It Cm info Op Ar path ...
3100 Display meta-data stored in a work tree.
3105 The work tree to use is resolved implicitly by walking upwards from the
3106 current working directory.
3110 arguments are specified, show additional per-file information for tracked
3111 files located at or within these paths.
3114 argument corresponds to the work tree's root directory, display information
3115 for all tracked files.
3118 .Bl -tag -width GOT_IGNORE_GITCONFIG
3120 The author's name and email address, such as
3121 .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
3131 may fail to parse commits without an email address in author data,
3135 environment variables with a missing email address.
3137 .Ev GOT_AUTHOR will be overridden by configuration settings in
3143 configuration settings in the repository's
3150 configuration settings contained in Git's global
3152 configuration file will only be used if neither
3156 environment variable provide author information.
3157 .It Ev GOT_IGNORE_GITCONFIG
3158 If this variable is set then any remote repository definitions or author
3159 information found in Git configuration files will be ignored.
3160 .It Ev GOT_LOG_DEFAULT_LIMIT
3161 The default limit on the number of commits traversed by
3163 If set to zero, the limit is unbounded.
3164 This variable will be silently ignored if it is set to a non-numeric value.
3165 .It Ev VISUAL , EDITOR
3166 The editor spawned by
3174 text editor will be spawned in order to give
3176 the attention it deserves.
3179 .Bl -tag -width packed-refs -compact
3181 Repository-wide configuration settings for
3185 configuration file located in the root directory of a Git repository
3186 supersedes any relevant settings in Git's
3190 .It Pa .got/got.conf
3191 Worktree-specific configuration settings for
3195 configuration file in the
3197 meta-data directory of a work tree supersedes any relevant settings in
3200 configuration file and Git's
3207 Enable tab-completion of
3212 .Dl $ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
3214 Clone an existing Git repository for use with
3218 .Dl $ got clone ssh://git@github.com/openbsd/src.git
3220 Use of HTTP URLs currently requires
3224 .Dl $ git clone --bare https://github.com/openbsd/src.git
3226 Alternatively, for quick and dirty local testing of
3228 a new Git repository could be created and populated with files,
3229 e.g. from a temporary CVS checkout located at
3232 .Dl $ gotadmin init /var/git/src.git
3233 .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
3235 Check out a work tree from the Git repository to /usr/src:
3237 .Dl $ got checkout /var/git/src.git /usr/src
3239 View local changes in a work tree directory:
3241 .Dl $ got diff | less
3243 In a work tree, display files in a potentially problematic state:
3245 .Dl $ got status -s 'C!~?'
3247 Interactively revert selected local changes in a work tree directory:
3249 .Dl $ got revert -p -R\ .
3251 In a work tree or a git repository directory, list all branch references:
3255 As above, but list the most recently modified branches only:
3257 .Dl $ got branch -lt | head
3259 In a work tree or a git repository directory, create a new branch called
3260 .Dq unified-buffer-cache
3261 which is forked off the
3265 .Dl $ got branch -c master unified-buffer-cache
3267 Switch an existing work tree to the branch
3268 .Dq unified-buffer-cache .
3269 Local changes in the work tree will be preserved and merged if necessary:
3271 .Dl $ got update -b unified-buffer-cache
3273 Create a new commit from local changes in a work tree directory.
3274 This new commit will become the head commit of the work tree's current branch:
3278 In a work tree or a git repository directory, view changes committed in
3279 the 3 most recent commits to the work tree's branch, or the branch resolved
3280 via the repository's HEAD reference, respectively:
3282 .Dl $ got log -p -l 3
3284 As above, but display changes in the order in which
3286 could apply them in sequence:
3288 .Dl $ got log -p -l 3 -R
3290 In a work tree or a git repository directory, log the history of a subdirectory:
3292 .Dl $ got log sys/uvm
3294 While operating inside a work tree, paths are specified relative to the current
3295 working directory, so this command will log the subdirectory
3298 .Dl $ cd sys/uvm && got log\ .
3300 And this command has the same effect:
3302 .Dl $ cd sys/dev/usb && got log ../../uvm
3304 And this command displays work tree meta-data about all tracked files:
3307 .Dl $ got info\ . | less
3309 Add new files and remove obsolete files in a work tree directory:
3311 .Dl $ got add sys/uvm/uvm_ubc.c
3312 .Dl $ got remove sys/uvm/uvm_vnode.c
3314 Create a new commit from local changes in a work tree directory
3315 with a pre-defined log message.
3317 .Dl $ got commit -m 'unify the buffer cache'
3319 Alternatively, create a new commit from local changes in a work tree
3320 directory with a log message that has been prepared in the file
3323 .Dl $ got commit -F /tmp/msg
3325 Update any work tree checked out from the
3326 .Dq unified-buffer-cache
3327 branch to the latest commit on this branch:
3331 Roll file content on the unified-buffer-cache branch back by one commit,
3332 and then fetch the rolled-back change into the work tree as a local change
3333 to be amended and perhaps committed again:
3335 .Dl $ got backout unified-buffer-cache
3336 .Dl $ got commit -m 'roll back previous'
3337 .Dl $ # now back out the previous backout :-)
3338 .Dl $ got backout unified-buffer-cache
3340 Fetch new changes on the remote repository's
3342 branch, making them visible on the local repository's
3349 In a repository created with a HTTP URL and
3350 .Cm git clone --bare
3353 command must be used instead:
3355 .Dl $ cd /var/git/src.git
3356 .Dl $ git fetch origin master:refs/remotes/origin/master
3360 branch to merge the new changes that are now visible on the
3365 .Dl $ got update -b origin/master
3366 .Dl $ got rebase master
3369 .Dq unified-buffer-cache
3370 branch on top of the new head commit of the
3374 .Dl $ got update -b master
3375 .Dl $ got rebase unified-buffer-cache
3377 Create a patch from all changes on the unified-buffer-cache branch.
3378 The patch can be mailed out for review and applied to
3382 .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
3384 Edit the entire commit history of the
3385 .Dq unified-buffer-cache
3388 .Dl $ got update -b unified-buffer-cache
3389 .Dl $ got update -c master
3392 Before working against existing branches in a repository cloned with
3393 .Cm git clone --bare
3398 must be configured to map all references in the remote repository
3401 namespace of the local repository.
3402 This can be achieved by setting Git's
3403 .Pa remote.origin.fetch
3404 configuration variable to the value
3405 .Dq +refs/heads/*:refs/remotes/origin/*
3410 .Dl $ cd /var/git/repo
3411 .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
3415 option must be disabled:
3417 .Dl $ cd /var/git/repo
3418 .Dl $ git config remote.origin.mirror false
3420 Alternatively, the following
3422 configuration item can be added manually to the Git repository's
3426 .Dl [remote \&"origin\&"]
3428 .Dl fetch = +refs/heads/*:refs/remotes/origin/*
3431 This configuration leaves the local repository's
3433 namespace free for use by local branches checked out with
3435 and, if needed, created with
3438 .Dq refs/remotes/origin
3439 namespace can now be updated with incoming changes from the remote
3444 without extra command line arguments.
3445 Newly fetched changes can be examined with
3448 Display changes on the remote repository's version of the
3450 branch, as of the last time
3454 .Dl $ got log -c origin/master | less
3456 As shown here, most commands accept abbreviated reference names such as
3459 .Dq refs/remotes/origin/master .
3460 The latter is only needed in case of ambiguity.
3463 must be used to merge changes which are visible on the
3468 This will also merge local changes, if any, with the incoming changes:
3470 .Dl $ got update -b origin/master
3471 .Dl $ got rebase master
3473 In order to make changes committed to the
3474 .Dq unified-buffer-cache
3478 .Dq unified-buffer-cache
3479 branch must first be rebased onto the
3483 .Dl $ got update -b master
3484 .Dl $ got rebase unified-buffer-cache
3487 .Dq unified-buffer-cache
3488 branch can now be made visible on the
3492 Because the rebase operation switched the work tree to the
3493 .Dq unified-buffer-cache
3494 branch, the work tree must be switched back to the
3498 .Dl $ got update -b master
3499 .Dl $ got integrate unified-buffer-cache
3503 branch, log messages for local changes can now be amended with
3505 by other developers and any other important new information:
3507 .Dl $ got update -c origin/master
3508 .Dl $ got histedit -m
3510 If the remote repository offers write access, local changes on the
3512 branch can be sent to the remote repository with
3516 can be run without further arguments.
3517 The arguments shown here match defaults, provided the work tree's
3518 current branch is the
3522 .Dl $ got send -b master origin
3524 If the remote repository requires the HTTPS protocol, the
3526 command must be used instead:
3528 .Dl $ cd /var/git/src.git
3529 .Dl $ git push origin master
3531 When making contributions to projects which use the
3533 workflow, SSH protocol repository access needs to be set up first.
3534 Once an account has been created on a Git hosting site it should
3535 be possible to upload a public SSH key for repository access
3540 workflow will usually involve two remote repositories.
3541 In the real-life example below, the
3543 repository was forked from the
3545 repository by using the Git hosting site's web interface.
3548 file in the local repository describes both remote repositories:
3549 .Bd -literal -offset indent
3550 # Jelmers's repository, which accepts pull requests
3552 server git@github.com
3554 repository "/jelmer/dulwich"
3558 # Stefan's fork, used as the default remote repository
3560 server git@github.com
3562 repository "/stspdotname/dulwich"
3567 With this configuration, Stefan can create commits on
3568 .Dq refs/heads/master
3569 and send them to the
3571 repository by running:
3573 .Dl $ got send -b master origin
3575 The changes can now be proposed to Jelmer by opening a pull request
3576 via the Git hosting site's web interface.
3577 If Jelmer requests further changes to be made, additional commits
3578 can be created on the
3580 branch and be added to the pull request by running
3584 If Jelmer prefers additional commits to be
3586 then the following commands can be used to achieve this:
3588 .Dl $ got update -b master
3589 .Dl $ got update -c origin/master
3590 .Dl $ got histedit -f
3591 .Dl $ got send -f -b master origin
3593 Once Jelmer has accepted the pull request, Stefan can fetch the
3594 merged changes, and possibly several other new changes, by running:
3596 .Dl $ got fetch upstream
3598 The merged changes will now be visible under the reference
3599 .Dq refs/remotes/upstream/master .
3602 branch can now be rebased on top of the latest changes
3605 .Dl $ got update -b upstream/master
3606 .Dl $ got rebase master
3608 As a final step, the forked repository's copy of the master branch needs
3609 to be kept in sync by sending the new changes there:
3611 .Dl $ got send -f -b master origin
3613 If multiple pull requests need to be managed in parallel, a separate branch
3614 must be created for each pull request with
3616 Each such branch can then be used as above, in place of
3617 .Dq refs/heads/master .
3618 Changes for any accepted pull requests will still appear under
3619 .Dq refs/remotes/upstream/master,
3620 regardless of which branch was used in the forked repository to
3621 create a pull request.
3625 .Xr git-repository 5 ,
3626 .Xr got-worktree 5 ,
3630 .An Anthony J. Bentley Aq Mt bentley@openbsd.org
3631 .An Christian Weisgerber Aq Mt naddy@openbsd.org
3632 .An Hiltjo Posthuma Aq Mt hiltjo@codemadness.org
3633 .An Josh Rickmar Aq Mt jrick@zettaport.com
3634 .An Joshua Stein Aq Mt jcs@openbsd.org
3635 .An Klemens Nanni Aq Mt kn@openbsd.org
3636 .An Martin Pieuchot Aq Mt mpi@openbsd.org
3637 .An Neels Hofmeyr Aq Mt neels@hofmeyr.de
3638 .An Omar Polo Aq Mt op@openbsd.org
3639 .An Ori Bernstein Aq Mt ori@openbsd.org
3640 .An Sebastien Marie Aq Mt semarie@openbsd.org
3641 .An Stefan Sperling Aq Mt stsp@openbsd.org
3642 .An Steven McDonald Aq Mt steven@steven-mcdonald.id.au
3643 .An Theo Buehler Aq Mt tb@openbsd.org
3644 .An Thomas Adam Aq Mt thomas@xteddy.org
3645 .An Tracey Emery Aq Mt tracey@traceyemery.net
3646 .An Yang Zhong Aq Mt yzhong@freebsdfoundation.org
3653 were derived from code under copyright by:
3655 .An Caldera International
3656 .An Daniel Hartmeier
3661 .An Jean-Francois Brousseau
3667 .An Niklas Hallqvist
3672 .An Xavier Santolaria
3675 contains code contributed to the public domain by
3676 .An Austin Appleby .
3679 is a work-in-progress and some features remain to be implemented.
3681 At present, the user has to fall back on
3683 to perform some tasks.
3687 Reading from remote repositories over HTTP or HTTPS protocols requires
3692 Writing to remote repositories over HTTP or HTTPS protocols requires
3695 The creation of merge commits with more than two parent commits requires
3698 In situations where files or directories were moved around
3700 will not automatically merge changes to new locations and
3702 will usually produce better results.
