2 .\" Copyright (c) 2017 Martin Pieuchot
3 .\" Copyright (c) 2018, 2019, 2020 Stefan Sperling
5 .\" Permission to use, copy, modify, and distribute this software for any
6 .\" purpose with or without fee is hereby granted, provided that the above
7 .\" copyright notice and this permission notice appear in all copies.
9 .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
30 is a version control system which stores the history of tracked files
31 in a Git repository, as used by the Git version control system.
32 This repository format is described in
33 .Xr git-repository 5 .
38 version control system because every copy of a repository is writeable.
39 Modifications made to files can be synchronized between repositories
44 must be checked out from the repository for modification.
45 Checked out files are stored in a
47 which can be placed at an arbitrary directory in the filesystem hierarchy.
48 The on-disk format of this work tree is described in
52 provides global and command-specific options.
53 Global options must precede the command name, and are as follows:
54 .Bl -tag -width tenletters
56 Display usage information and exit immediately.
58 Display program version and exit immediately.
64 .Bl -tag -width checkout
71 .Op Fl r Ar repository-path
75 Create an initial commit in a repository from the file hierarchy
78 The created commit will not have any parent commits, i.e. it will be a
80 Also create a new reference which provides a branch name for the newly
82 Show the path of each imported file to indicate progress.
88 environment variable to be set,
89 unless an author has been configured in
95 configuration settings can be obtained from the repository's
97 file or from Git's global
108 If this option is not specified, a branch corresponding to the repository's
109 HEAD reference will be used.
110 Use of this option is required if the branch resolved via the repository's
111 HEAD reference already exists.
113 Ignore files or directories with a name which matches the specified
115 This option may be specified multiple times to build a list of ignore patterns.
118 follows the globbing rules documented in
121 Use the specified log message when creating the new commit.
126 opens a temporary file in an editor where a log message can be written.
127 .It Fl r Ar repository-path
128 Use the repository at the specified path.
129 If not specified, assume the repository is located at or above the current
137 .Op Fl R Ar reference
142 Clone a Git repository at the specified
148 is specified, the directory name will be derived from the name of the
151 will refuse to run if the
157 specifies a protocol scheme, a server hostname, an optional port number
158 separated from the hostname by a colon, and a path to the repository on
160 .Lk scheme://hostname:port/path/to/repository
162 The following protocol schemes are supported:
163 .Bl -tag -width git+ssh
165 The Git protocol as implemented by the
168 Use of this protocol is discouraged since it supports neither authentication
171 The Git protocol wrapped in an authenticated and encrypted
174 With this protocol the hostname may contain an embedded username for
179 Short alias for git+ssh.
182 Objects in the cloned repository are stored in a pack file which is downloaded
184 This pack file will then be indexed to facilitate access to the objects stored
186 If any objects in the pack file are stored in deltified form, all deltas will
187 be fully resolved in order to compute the ID of such objects.
188 This can take some time.
189 More details about the pack file format are documented in
190 .Xr git-repository 5 .
193 creates a remote repository entry in the
197 files of the cloned repository to store the
203 arguments for future use by
213 Fetch all branches from the remote repository's
215 reference namespace and set
216 .Cm fetch_all_branches
217 in the cloned repository's
219 file for future use by
221 If this option is not specified, a branch resolved via the remote
222 repository's HEAD reference will be fetched.
223 Cannot be used together with the
229 from the remote repository's
232 This option may be specified multiple times to build a list of branches
234 If the branch corresponding to the remote repository's HEAD reference is not
235 in this list, the cloned repository's HEAD reference will be set to the first
236 branch which was fetched.
237 If this option is not specified, a branch resolved via the remote
238 repository's HEAD reference will be fetched.
239 Cannot be used together with the
243 List branches and tags available for fetching from the remote repository
244 and exit immediately.
245 Cannot be used together with any of the other options except
250 Create the cloned repository as a mirror of the original repository.
251 This is useful if the cloned repository will not be used to store
252 locally created commits.
258 files will be set up with the
260 option enabled, such that
264 will write incoming changes directly to branches in the
266 reference namespace, rather than to branches in the
269 This avoids the usual requirement of having to run
273 in order to make incoming changes appear on branches in the
276 But maintaining custom changes in the cloned repository becomes difficult
277 since such changes will be at risk of being discarded whenever incoming
280 Suppress progress reporting output.
281 The same option will be passed to
284 .It Fl R Ar reference
285 In addition to the branches and tags that will be fetched, fetch an arbitrary
287 from the remote repository's
290 This option may be specified multiple times to build a list of additional
294 may either be a path to a specific reference, or a reference namespace
295 which will cause all references in this namespace to be fetched.
297 Each reference will be mapped into the cloned repository's
299 namespace, unless the
301 option is used to mirror references directly into the cloned repository's
306 will refuse to fetch references from the remote repository's
315 to print debugging messages to standard error output.
316 This option will be passed to
319 Multiple -v options increase the verbosity.
327 .Op Fl R Ar reference
328 .Op Fl r Ar repository-path
329 .Op Ar remote-repository
332 Fetch new changes from a remote repository.
334 .Ar remote-repository
338 The remote repository's URL is obtained from the corresponding entry in
342 file of the local repository, as created by
345 New changes will be stored in a separate pack file downloaded from the server.
346 Optionally, separate pack files stored in the repository can be combined with
349 By default, branch references in the
351 reference namespace will be updated to point at the newly fetched commits.
354 command can then be used to make new changes visible on branches in the
356 namespace, merging incoming changes with the changes on those branches
359 If the repository was created as a mirror with
361 then all branches in the
363 namespace will be updated directly to match the corresponding branches in
364 the remote repository.
365 If those branches contained local commits, these commits will no longer be
366 reachable via a reference and will therefore be at risk of being discarded
367 by Git's garbage collector or
368 .Cm gotadmin cleanup .
369 Maintaining custom changes in a mirror repository is therefore discouraged.
371 In any case, references in the
373 namespace will always be fetched and mapped directly to local references
374 in the same namespace.
381 Fetch all branches from the remote repository's
384 This option can be enabled by default for specific repositories in
386 If this option is not specified, a branch resolved via the remote
387 repository's HEAD reference will be fetched.
388 Cannot be used together with the
394 from the remote repository's
397 This option may be specified multiple times to build a list of branches
399 If this option is not specified, the work tree's current branch
400 will be fetched if invoked within a work tree,
401 otherwise a branch resolved via the remote repository's HEAD reference
403 Cannot be used together with the
407 Delete branches and tags from the local repository which are no longer
408 present in the remote repository.
409 Only references are deleted.
410 Any commit, tree, tag, and blob objects belonging to deleted branches or
411 tags remain in the repository and may be removed separately with
412 Git's garbage collector or
413 .Cm gotadmin cleanup .
415 List branches and tags available for fetching from the remote repository
416 and exit immediately.
417 Cannot be used together with any of the other options except
423 Suppress progress reporting output.
424 The same option will be passed to
427 .It Fl R Ar reference
428 In addition to the branches and tags that will be fetched, fetch an arbitrary
430 from the remote repository's
433 This option may be specified multiple times to build a list of additional
437 may either be a path to a specific reference, or a reference namespace
438 which will cause all references in this namespace to be fetched.
440 Each reference will be mapped into the local repository's
442 namespace, unless the local repository was created as a mirror with
444 in which case references will be mapped directly into the local repository's
448 Once a reference has been fetched, a branch based on it can be created with
453 will refuse to fetch references from the remote repository's
458 .It Fl r Ar repository-path
459 Use the repository at the specified path.
460 If not specified, assume the repository is located at or above the current
462 If this directory is a
464 work tree, use the repository path associated with this work tree.
466 Allow existing references in the
468 namespace to be updated if they have changed on the server.
469 If not specified, only new tag references will be created.
474 to print debugging messages to standard error output.
475 The same option will be passed to
478 Multiple -v options increase the verbosity.
481 Delete all references which correspond to a particular
482 .Ar remote-repository
483 instead of fetching new changes.
484 This can be useful when a remote repository is being removed from
490 .Ar remote-repository
491 argument is mandatory and no other options except
498 Only references are deleted.
499 Any commit, tree, tag, and blob objects fetched from a remote repository
500 will generally be stored in pack files and may be removed separately with
502 and Git's garbage collector.
510 .Op Fl p Ar path-prefix
512 .Op Ar work-tree-path
515 Copy files from a repository into a new work tree.
516 Show the status of each affected file, using the following status codes:
517 .Bl -column YXZ description
518 .It A Ta new file was added
519 .It E Ta file already exists in work tree's meta-data
524 is not specified, either use the last component of
525 .Ar repository path ,
528 was specified use the last component of
536 Check out files from a commit on the specified
538 If this option is not specified, a branch resolved via the repository's HEAD
539 reference will be used.
541 Check out files from the specified
543 on the selected branch.
544 The expected argument is a commit ID SHA1 hash or an existing reference
545 or tag name which will be resolved to a commit ID.
546 An abbreviated hash argument will be expanded to a full SHA1 hash
547 automatically, provided the abbreviation is unique.
548 If this option is not specified, the most recent commit on the selected
553 is not contained in the selected branch, a different branch which contains
554 this commit must be specified with the
557 If no such branch is known, a new branch must be created for this
563 Checking out work trees with an unknown branch is intentionally not supported.
565 Proceed with the checkout operation even if the directory at
568 Existing files will be left intact.
569 .It Fl p Ar path-prefix
570 Restrict the work tree to a subset of the repository's tree hierarchy.
571 Only files beneath the specified
575 Silence progress output.
586 Update an existing work tree to a different
588 Change existing files in the work tree as necessary to match file contents
590 Preserve any local changes in the work tree and merge them with the
593 Files which already contain merge conflicts will not be updated to avoid
594 further complications.
595 Such files will be updated when
597 is run again after merge conflicts have been resolved.
598 If the conflicting changes are no longer needed, affected files can be
605 Show the status of each affected file, using the following status codes:
606 .Bl -column YXZ description
607 .It U Ta file was updated and contained no local changes
608 .It G Ta file was updated and local changes were merged cleanly
609 .It C Ta file was updated and conflicts occurred during merge
610 .It D Ta file was deleted
611 .It A Ta new file was added
612 .It \(a~ Ta versioned file is obstructed by a non-regular file
613 .It ! Ta a missing versioned file was restored
614 .It # Ta file was not updated because it contains merge conflicts
615 .It ? Ta changes destined for an unversioned file were not merged
620 is specified, update the entire work tree.
621 Otherwise, restrict the update operation to files at or within the
623 Each path is required to exist in the update operation's target commit.
624 Files in the work tree outside specified paths will remain unchanged and
625 will retain their previously recorded base commit.
628 commands may refuse to run while the work tree contains files from
629 multiple base commits.
630 The base commit of such a work tree can be made consistent by running
632 across the entire work tree.
635 is incompatible with the
640 cannot update paths with staged changes.
641 If changes have been staged with
643 these changes must first be committed with
653 Switch the work tree's branch reference to the specified
655 before updating the work tree.
656 This option requires that all paths in the work tree are updated.
658 As usual, any local changes in the work tree will be preserved.
659 This can be useful when switching to a newly created branch in order
660 to commit existing local changes to this branch.
662 Any local changes must be dealt with separately in order to obtain a
663 work tree with pristine file contents corresponding exactly to the specified
665 Such changes could first be committed to a different branch with
667 or could be discarded with
670 Update the work tree to the specified
672 The expected argument is a commit ID SHA1 hash or an existing reference
673 or tag name which will be resolved to a commit ID.
674 An abbreviated hash argument will be expanded to a full SHA1 hash
675 automatically, provided the abbreviation is unique.
676 If this option is not specified, the most recent commit on the work tree's
679 Silence progress output.
685 .Op Fl S Ar status-codes
686 .Op Fl s Ar status-codes
690 Show the current modification status of files in a work tree,
691 using the following status codes:
692 .Bl -column YXZ description
693 .It M Ta modified file
694 .It A Ta file scheduled for addition in next commit
695 .It D Ta file scheduled for deletion in next commit
696 .It C Ta modified or added file which contains merge conflicts
697 .It ! Ta versioned file was expected on disk but is missing
698 .It \(a~ Ta versioned file is obstructed by a non-regular file
699 .It ? Ta unversioned item not tracked by
701 .It m Ta modified file modes (executable bit only)
702 .It N Ta non-existent
704 specified on the command line
709 is specified, show modifications in the entire work tree.
710 Otherwise, show modifications at or within the specified paths.
712 If changes have been staged with
714 staged changes are shown in the second output column, using the following
716 .Bl -column YXZ description
717 .It M Ta file modification is staged
718 .It A Ta file addition is staged
719 .It D Ta file deletion is staged
722 Changes created on top of staged changes are indicated in the first column:
723 .Bl -column YXZ description
724 .It MM Ta file was modified after earlier changes have been staged
725 .It MA Ta file was modified after having been staged for addition
733 Show unversioned files even if they match an ignore pattern.
734 .It Fl S Ar status-codes
735 Suppress the output of files with a modification status matching any of the
736 single-character status codes contained in the
739 Any combination of codes from the above list of possible status codes
741 For staged files, status codes displayed in either column will be matched.
742 Cannot be used together with the
745 .It Fl s Ar status-codes
746 Only show files with a modification status matching any of the
747 single-character status codes contained in the
750 Any combination of codes from the above list of possible status codes
752 For staged files, status codes displayed in either column will be matched.
753 Cannot be used together with the
758 For compatibility with
769 files in each traversed directory and will not display unversioned files
770 which match these patterns.
775 supports consecutive asterisks,
777 which will match an arbitrary amount of directories.
781 only supports a single ignore pattern per line.
785 does not support negated ignore patterns prefixed with
787 and gives no special significance to the location of path component separators,
796 .Op Fl r Ar repository-path
797 .Op Fl S Ar search-pattern
801 Display history of a repository.
804 is specified, show only commits which modified this path.
805 If invoked in a work tree, the
807 is interpreted relative to the current working directory,
808 and the work tree's path prefix is implicitly prepended.
809 Otherwise, the path is interpreted relative to the repository root.
816 Display individual commits which were merged into the current branch
820 shows the linear history of the current branch only.
822 Set the number of context lines shown in diffs with
824 By default, 3 lines of context are shown.
826 Start traversing history at the specified
828 The expected argument is a commit ID SHA1 hash or an existing reference
829 or tag name which will be resolved to a commit ID.
830 An abbreviated hash argument will be expanded to a full SHA1 hash
831 automatically, provided the abbreviation is unique.
832 If this option is not specified, default to the work tree's current branch
833 if invoked in a work tree, or to the repository's HEAD reference.
835 Display diffstat of changes introduced in each commit.
836 Cannot be used with the
840 Limit history traversal to a given number of commits.
841 If this option is not specified, a default limit value of zero is used,
842 which is treated as an unbounded limit.
844 .Ev GOT_LOG_DEFAULT_LIMIT
845 environment variable may be set to change this default value.
847 Display the list of file paths changed in each commit, using the following
849 .Bl -column YXZ description
850 .It M Ta modified file
851 .It D Ta file was deleted
852 .It A Ta new file was added
853 .It m Ta modified file modes (executable bit only)
856 Cannot be used with the
860 Display the patch of modifications made in each commit.
863 is specified, only show the patch of modifications at or within this path.
864 Cannot be used with the
868 Determine a set of commits to display as usual, but display these commits
870 .It Fl r Ar repository-path
871 Use the repository at the specified path.
872 If not specified, assume the repository is located at or above the current
874 If this directory is a
876 work tree, use the repository path associated with this work tree.
877 .It Fl S Ar search-pattern
878 If specified, show only commits with a log message, author name,
879 committer name, or ID SHA1 hash matched by the extended regular
882 Lines in committed patches will be matched if
885 File paths changed by a commit will be matched if
888 Regular expression syntax is documented in
891 Display a short one-line summary of each commit, instead of the default
893 Cannot be used together with the
899 Stop traversing commit history immediately after the specified
902 This option has no effect if the specified
912 .Op Fl r Ar repository-path
913 .Op Ar object1 Ar object2 | Ar path ...
916 When invoked within a work tree without any arguments, display all
917 local changes in the work tree.
920 arguments are specified, only show changes within the specified paths.
922 If two arguments are provided, treat each argument as a reference, a tag
923 name, or an object ID SHA1 hash, and display differences between the
924 corresponding objects.
925 Both objects must be of the same type (blobs, trees, or commits).
926 An abbreviated hash argument will be expanded to a full SHA1 hash
927 automatically, provided the abbreviation is unique.
928 If none of these interpretations produce a valid result or if the
933 is running in a work tree, attempt to interpret the two arguments as paths.
940 Treat file contents as ASCII text even if binary data is detected.
942 Set the number of context lines shown in the diff.
943 By default, 3 lines of context are shown.
945 Show differences between commits in the repository.
946 This option may be used up to two times.
947 When used only once, show differences between the specified
949 and its first parent commit.
950 When used twice, show differences between the two specified commits.
952 The expected argument is a commit ID SHA1 hash or an existing reference
953 or tag name which will be resolved to a commit ID.
954 An abbreviated hash argument will be expanded to a full SHA1 hash
955 automatically, provided the abbreviation is unique.
959 option is used, all non-option arguments will be interpreted as paths.
962 arguments are provided, only show differences for the specified paths.
964 Cannot be used together with the
968 Display diffstat of changes before the actual diff by annotating each file path
969 or blob hash being diffed with the total number of lines added and removed.
970 A summary line will display the total number of changes across all files.
972 Interpret all arguments as paths only.
973 This option can be used to resolve ambiguity in cases where paths
974 look like tag names, reference names, or object IDs.
975 This option is only valid when
977 is invoked in a work tree.
978 .It Fl r Ar repository-path
979 Use the repository at the specified path.
980 If not specified, assume the repository is located at or above the current
982 If this directory is a
984 work tree, use the repository path associated with this work tree.
986 Show changes staged with
988 instead of showing local changes in the work tree.
989 This option is only valid when
991 is invoked in a work tree.
993 Ignore whitespace-only changes.
999 .Op Fl r Ar repository-path
1003 Display line-by-line history of a file at the specified path.
1010 Start traversing history at the specified
1012 The expected argument is a commit ID SHA1 hash or an existing reference
1013 or tag name which will be resolved to a commit ID.
1014 An abbreviated hash argument will be expanded to a full SHA1 hash
1015 automatically, provided the abbreviation is unique.
1016 .It Fl r Ar repository-path
1017 Use the repository at the specified path.
1018 If not specified, assume the repository is located at or above the current
1020 If this directory is a
1022 work tree, use the repository path associated with this work tree.
1029 .Op Fl r Ar repository-path
1033 Display a listing of files and directories at the specified
1034 directory path in the repository.
1035 Entries shown in this listing may carry one of the following trailing
1037 .Bl -column YXZ description
1038 .It @ Ta entry is a symbolic link
1039 .It / Ta entry is a directory
1040 .It * Ta entry is an executable file
1041 .It $ Ta entry is a Git submodule
1044 Symbolic link entries are also annotated with the target path of the link.
1048 is specified, list the repository path corresponding to the current
1049 directory of the work tree, or the root directory of the repository
1050 if there is no work tree.
1057 List files and directories as they appear in the specified
1059 The expected argument is a commit ID SHA1 hash or an existing reference
1060 or tag name which will be resolved to a commit ID.
1061 An abbreviated hash argument will be expanded to a full SHA1 hash
1062 automatically, provided the abbreviation is unique.
1064 Show object IDs of files (blob objects) and directories (tree objects).
1066 Recurse into sub-directories in the repository.
1067 .It Fl r Ar repository-path
1068 Use the repository at the specified path.
1069 If not specified, assume the repository is located at or above the current
1071 If this directory is a
1073 work tree, use the repository path associated with this work tree.
1079 .Op Fl r Ar repository-path
1080 .Op Fl s Ar reference
1083 Manage references in a repository.
1085 References may be listed, created, deleted, and changed.
1086 When creating, deleting, or changing a reference the specified
1088 must be an absolute reference name, i.e. it must begin with
1096 Create a reference or change an existing reference.
1097 The reference with the specified
1099 will point at the specified
1103 argument is a ID SHA1 hash or an existing reference or tag name which will
1104 be resolved to the ID of a corresponding commit, tree, tag, or blob object.
1105 Cannot be used together with any other options except
1108 Delete the reference with the specified
1110 from the repository.
1111 Any commit, tree, tag, and blob objects belonging to deleted references
1112 remain in the repository and may be removed separately with
1113 Git's garbage collector or
1114 .Cm gotadmin cleanup .
1115 Cannot be used together with any other options except
1118 List references in the repository.
1121 is specified, list all existing references in the repository.
1124 is a reference namespace, list all references in this namespace.
1125 Otherwise, show only the reference with the given
1127 Cannot be used together with any other options except
1131 .It Fl r Ar repository-path
1132 Use the repository at the specified path.
1133 If not specified, assume the repository is located at or above the current
1135 If this directory is a
1137 work tree, use the repository path associated with this work tree.
1138 .It Fl s Ar reference
1139 Create a symbolic reference, or change an existing symbolic reference.
1140 The symbolic reference with the specified
1142 will point at the specified
1144 which must already exist in the repository.
1145 Care should be taken not to create loops between references when
1146 this option is used.
1147 Cannot be used together with any other options except
1150 Sort listed references by modification time (most recently modified first)
1151 instead of sorting by lexicographical order.
1152 Use of this option requires the
1154 option to be used as well.
1162 .Op Fl r Ar repository-path
1166 Create, list, or delete branches.
1168 Local branches are managed via references which live in the
1170 reference namespace.
1173 command creates references in this namespace only.
1175 When deleting branches, the specified
1179 reference namespace first.
1180 If no corresponding branch is found, the
1182 namespace will be searched next.
1184 If invoked in a work tree without any arguments, print the name of the
1185 work tree's current branch.
1189 argument is passed, attempt to create a branch reference with the given name.
1190 By default the new branch reference will point at the latest commit on the
1191 work tree's current branch if invoked in a work tree, and otherwise to a commit
1192 resolved via the repository's HEAD reference.
1194 If invoked in a work tree, once the branch was created successfully
1195 switch the work tree's head reference to the newly created branch and
1196 update files across the entire work tree, just like
1197 .Cm got update -b Ar name
1199 Show the status of each affected file, using the following status codes:
1200 .Bl -column YXZ description
1201 .It U Ta file was updated and contained no local changes
1202 .It G Ta file was updated and local changes were merged cleanly
1203 .It C Ta file was updated and conflicts occurred during merge
1204 .It D Ta file was deleted
1205 .It A Ta new file was added
1206 .It \(a~ Ta versioned file is obstructed by a non-regular file
1207 .It ! Ta a missing versioned file was restored
1215 Make a newly created branch reference point at the specified
1219 argument is a commit ID SHA1 hash or an existing reference
1220 or tag name which will be resolved to a commit ID.
1222 Delete the branch with the specified
1228 reference namespace.
1230 Only the branch reference is deleted.
1231 Any commit, tree, and blob objects belonging to the branch
1232 remain in the repository and may be removed separately with
1233 Git's garbage collector or
1234 .Cm gotadmin cleanup .
1236 List all existing branches in the repository, including copies of remote
1237 repositories' branches in the
1239 reference namespace.
1241 If invoked in a work tree, the work tree's current branch is shown
1242 with one the following annotations:
1243 .Bl -column YXZ description
1244 .It * Ta work tree's base commit matches the branch tip
1245 .It \(a~ Ta work tree's base commit is out-of-date
1248 Do not switch and update the work tree after creating a new branch.
1249 .It Fl r Ar repository-path
1250 Use the repository at the specified path.
1251 If not specified, assume the repository is located at or above the current
1253 If this directory is a
1255 work tree, use the repository path associated with this work tree.
1257 Sort listed branches by modification time (most recently modified first)
1258 instead of sorting by lexicographical order.
1261 reference namespace are listed before branches in
1264 Use of this option requires the
1266 option to be used as well.
1273 .Op Fl r Ar repository-path
1274 .Op Fl s Ar signer-id
1277 Manage tags in a repository.
1279 Tags are managed via references which live in the
1281 reference namespace.
1284 command operates on references in this namespace only.
1285 References in this namespace point at tag objects which contain a pointer
1286 to another object, a tag message, as well as author and timestamp information.
1288 Attempt to create a tag with the given
1290 and make this tag point at the given
1292 If no commit is specified, default to the latest commit on the work tree's
1293 current branch if invoked in a work tree, and to a commit resolved via
1294 the repository's HEAD reference otherwise.
1301 Make the newly created tag reference point at the specified
1305 argument is a commit ID SHA1 hash or an existing reference or tag name which
1306 will be resolved to a commit ID.
1307 An abbreviated hash argument will be expanded to a full SHA1 hash
1308 automatically, provided the abbreviation is unique.
1310 List all existing tags in the repository instead of creating a new tag.
1313 argument is passed, show only the tag with the given
1316 Use the specified tag message when creating the new tag.
1321 opens a temporary file in an editor where a tag message can be written.
1322 .It Fl r Ar repository-path
1323 Use the repository at the specified path.
1324 If not specified, assume the repository is located at or above the current
1326 If this directory is a
1328 work tree, use the repository path associated with this work tree.
1329 .It Fl s Ar signer-id
1330 While creating a new tag, sign this tag with the identity given in
1333 For SSH-based signatures,
1335 is the path to a file which may refer to either a private SSH key,
1336 or a public SSH key with the private half available via
1339 will sign the tag object by invoking
1343 command, using the signature namespace
1345 for compatibility with
1348 Verify tag object signatures.
1351 is specified, show and verify the tag object with the provided name.
1352 Otherwise, list all tag objects and verify signatures where present.
1355 verifies SSH-based signatures by invoking
1358 .Fl Y Cm verify Fl f Ar allowed_signers .
1363 otherwise verification is impossible.
1366 During SSH signature creation and verification this option will be passed to
1368 Multiple -v options increase the verbosity.
1374 command will not delete tags or change existing tags.
1375 If a tag must be deleted, the
1377 command may be used to delete a tag's reference.
1378 This should only be done if the tag has not already been copied to
1385 Schedule unversioned files in a work tree for addition to the
1386 repository in the next commit.
1387 By default, files which match a
1389 ignore pattern will not be added.
1396 Add files even if they match a
1400 Permit recursion into directories.
1401 If this option is not specified,
1403 will refuse to run if a specified
1411 .Op Fl s Ar status-codes
1415 Remove versioned files from a work tree and schedule them for deletion
1416 from the repository in the next commit.
1423 Perform the operation even if a file contains local modifications,
1424 and do not raise an error if a specified
1426 does not exist on disk.
1428 Keep affected files on disk.
1430 Permit recursion into directories.
1431 If this option is not specified,
1433 will refuse to run if a specified
1436 .It Fl s Ar status-codes
1437 Only delete files with a modification status matching one of the
1438 single-character status codes contained in the
1441 The following status codes may be specified:
1442 .Bl -column YXZ description
1443 .It M Ta modified file (this implies the
1446 .It ! Ta versioned file expected on disk but missing
1454 .Op Fl p Ar strip-count
1460 to files in a work tree.
1461 Files added or removed by a patch will be scheduled for addition or removal in
1464 The patch must be in the unified diff format as produced by
1471 diff when invoked with their
1476 argument is provided, read unified diff data from standard input instead.
1480 contains multiple patches, then attempt to apply each of them in sequence.
1482 Show the status of each affected file, using the following status codes:
1483 .Bl -column XYZ description
1484 .It M Ta file was modified
1485 .It G Ta file was merged using a merge-base found in the repository
1486 .It C Ta file was merged and conflicts occurred during merge
1487 .It D Ta file was deleted
1488 .It A Ta file was added
1489 .It # Ta failed to patch the file
1492 If a change does not match at its exact line number, attempt to
1493 apply it somewhere else in the file if a good spot can be found.
1494 Otherwise, the patch will fail to apply.
1498 will refuse to apply a patch if certain preconditions are not met.
1499 Files to be deleted must already be under version control, and must
1500 not have been scheduled for deletion already.
1501 Files to be added must not yet be under version control and must not
1502 already be present on disk.
1503 Files to be modified must already be under version control and may not
1504 contain conflict markers.
1506 If an error occurs, the
1508 operation will be aborted.
1509 Any changes made to the work tree up to this point will be left behind.
1510 Such changes can be viewed with
1512 and can be reverted with
1521 Attempt to locate files within the specified
1523 for use as a merge-base for 3-way merges.
1524 Ideally, the specified
1526 should contain versions of files which the changes contained in the
1529 Files will be located by path, relative to the repository root.
1532 option is used then leading path components will be stripped
1533 before paths are looked up in the repository.
1537 option is not used then
1539 will attempt to locate merge-bases via object IDs found in
1541 meta-data, such as produced by
1547 option is only recommended in the absence of such meta-data.
1549 In case no merge-base is available for a file, changes will be applied
1550 without doing a 3-way merge.
1551 Changes which do not apply cleanly may then be rejected entirely, rather
1552 than producing merge conflicts in the patched target file.
1554 Do not make any modifications to the work tree.
1555 This can be used to check whether a patch would apply without issues.
1558 contains diffs that affect the same file multiple times, the results
1559 displayed may be incorrect.
1560 .It Fl p Ar strip-count
1561 Specify the number of leading path components to strip from paths
1570 path prefixes generated by
1572 will be recognized and stripped automatically.
1574 Reverse the patch before applying it.
1580 .Op Fl F Ar response-script
1584 Revert any local changes in files at the specified paths in a work tree.
1585 File contents will be overwritten with those contained in the
1586 work tree's base commit.
1587 There is no way to bring discarded changes back after
1590 If a file was added with
1592 it will become an unversioned file again.
1593 If a file was deleted with
1595 it will be restored.
1601 .It Fl F Ar response-script
1609 responses line-by-line from the specified
1611 file instead of prompting interactively.
1613 Instead of reverting all changes in files, interactively select or reject
1614 changes to revert based on
1620 (quit reverting this file) responses.
1621 If a file is in modified status, individual patches derived from the
1622 modified file content can be reverted.
1623 Files in added or deleted status may only be reverted in their entirety.
1625 Permit recursion into directories.
1626 If this option is not specified,
1628 will refuse to run if a specified
1642 Create a new commit in the repository from changes in a work tree
1643 and use this commit as the new base commit for the work tree.
1646 is specified, commit all changes in the work tree.
1647 Otherwise, commit changes at or within the specified paths.
1649 If changes have been explicitly staged for commit with
1651 only commit staged changes and reject any specified paths which
1652 have not been staged.
1655 opens a temporary file in an editor where a log message can be written
1663 options are used together.
1665 Show the status of each affected file, using the following status codes:
1666 .Bl -column YXZ description
1667 .It M Ta modified file
1668 .It D Ta file was deleted
1669 .It A Ta new file was added
1670 .It m Ta modified file modes (executable bit only)
1673 Files which are not part of the new commit will retain their previously
1674 recorded base commit.
1677 commands may refuse to run while the work tree contains files from
1678 multiple base commits.
1679 The base commit of such a work tree can be made consistent by running
1681 across the entire work tree.
1685 command requires the
1687 environment variable to be set,
1688 unless an author has been configured in
1694 configuration settings can be
1695 obtained from the repository's
1697 file or from Git's global
1706 Set author information in the newly created commit to
1708 This is useful when committing changes which were written by someone
1712 argument must use the same format as the
1714 environment variable.
1716 In addition to storing author information, the newly created commit
1719 information which is obtained, as usual, from the
1721 environment variable, or
1723 or Git configuration settings.
1725 Use the prepared log message stored in the file found at
1727 when creating the new commit.
1729 opens a temporary file in an editor where the prepared log message can be
1730 reviewed and edited further if needed.
1731 Cannot be used together with the
1735 Use the specified log message when creating the new commit.
1736 Cannot be used together with the
1740 This option prevents
1742 from opening the commit message in an editor.
1743 It has no effect unless it is used together with the
1745 option and is intended for non-interactive use such as scripting.
1747 This option prevents
1749 from generating a diff of the to-be-committed changes in a temporary file
1750 which can be viewed while editing a commit message.
1752 Allow the addition of symbolic links which point outside of the path space
1753 that is under version control.
1756 will reject such symbolic links due to safety concerns.
1759 may decide to represent such a symbolic link as a regular file which contains
1760 the link's target path, rather than creating an actual symbolic link which
1761 points outside of the work tree.
1762 Use of this option is discouraged because external mechanisms such as
1764 are better suited for managing symbolic links to paths not under
1769 will refuse to run if certain preconditions are not met.
1770 If the work tree's current branch is not in the
1772 reference namespace, new commits may not be created on this branch.
1773 Local changes may only be committed if they are based on file content
1774 found in the most recent commit on the work tree's branch.
1775 If a path is found to be out of date,
1777 must be used first in order to merge local changes with changes made
1785 .Op Fl r Ar repository-path
1787 .Op Ar remote-repository
1790 Send new changes to a remote repository.
1792 .Ar remote-repository
1796 The remote repository's URL is obtained from the corresponding entry in
1800 file of the local repository, as created by
1803 All objects corresponding to new changes will be written to a temporary
1804 pack file which is then uploaded to the server.
1805 Upon success, references in the
1807 reference namespace of the local repository will be updated to point at
1808 the commits which have been sent.
1810 By default, changes will only be sent if they are based on up-to-date
1811 copies of relevant branches in the remote repository.
1812 If any changes to be sent are based on out-of-date copies or would
1813 otherwise break linear history of existing branches, new changes must
1814 be fetched from the server with
1816 and local branches must be rebased with
1823 option can be used to make exceptions to these requirements.
1830 Send all branches from the local repository's
1832 reference namespace.
1835 option is equivalent to listing all branches with multiple
1838 Cannot be used together with the
1844 from the local repository's
1846 reference namespace.
1847 This option may be specified multiple times to build a list of branches
1849 If this option is not specified, default to the work tree's current branch
1850 if invoked in a work tree, or to the repository's HEAD reference.
1851 Cannot be used together with the
1855 Delete the specified
1857 from the remote repository's
1859 reference namespace.
1860 This option may be specified multiple times to build a list of branches
1863 Only references are deleted.
1864 Any commit, tree, tag, and blob objects belonging to deleted branches
1865 may become subject to deletion by Git's garbage collector running on
1868 Requesting deletion of branches results in an error if the server
1869 does not support this feature or disallows the deletion of branches
1870 based on its configuration.
1872 Attempt to force the server to overwrite existing branches or tags
1873 in the remote repository, even when
1877 would usually be required before changes can be sent.
1878 The server may reject forced requests regardless, depending on its
1881 Any commit, tree, tag, and blob objects belonging to overwritten branches
1882 or tags may become subject to deletion by Git's garbage collector running
1887 reference namespace is globally shared between all repositories.
1890 option to overwrite tags is discouraged because it can lead to
1891 inconsistencies between the tags present in different repositories.
1892 In general, creating a new tag with a different name is recommended
1893 instead of overwriting an existing tag.
1897 option is particularly discouraged if changes being sent are based
1898 on an out-of-date copy of a branch in the remote repository.
1899 Instead of using the
1901 option, new changes should
1904 and local branches should be rebased with
1906 followed by another attempt to send the changes.
1910 option should only be needed in situations where the remote repository's
1911 copy of a branch or tag is known to be out-of-date and is considered
1913 The risks of creating inconsistencies between different repositories
1914 should also be taken into account.
1916 Suppress progress reporting output.
1917 The same option will be passed to
1920 .It Fl r Ar repository-path
1921 Use the repository at the specified path.
1922 If not specified, assume the repository is located at or above the current
1924 If this directory is a
1926 work tree, use the repository path associated with this work tree.
1928 Attempt to send all tags from the local repository's
1930 reference namespace.
1933 option is equivalent to listing all tags with multiple
1936 Cannot be used together with the
1942 from the local repository's
1944 reference namespace, in addition to any branches that are being sent.
1947 option may be specified multiple times to build a list of tags to send.
1948 No tags will be sent if the
1952 Raise an error if the specified
1954 already exists in the remote repository, unless the
1956 option is used to overwrite the server's copy of the tag.
1957 In general, creating a new tag with a different name is recommended
1958 instead of overwriting an existing tag.
1960 Cannot be used together with the
1967 to print debugging messages to standard error output.
1968 The same option will be passed to
1971 Multiple -v options increase the verbosity.
1981 Merge changes from a single
1986 should be on a different branch than the work tree's base commit.
1987 The expected argument is a reference or a commit ID SHA1 hash.
1988 An abbreviated hash argument will be expanded to a full SHA1 hash
1989 automatically, provided the abbreviation is unique.
1991 Show the status of each affected file, using the following status codes:
1992 .Bl -column YXZ description
1993 .It G Ta file was merged
1994 .It C Ta file was merged and conflicts occurred during merge
1995 .It ! Ta changes destined for a missing file were not merged
1996 .It D Ta file was deleted
1997 .It d Ta file's deletion was prevented by local modifications
1998 .It A Ta new file was added
1999 .It \(a~ Ta changes destined for a non-regular file were not merged
2000 .It ? Ta changes destined for an unversioned file were not merged
2003 The merged changes will appear as local changes in the work tree, which
2006 amended manually or with further
2012 If invoked in a work tree where no
2017 operation is taking place,
2019 creates a record of commits which have been merged into the work tree.
2020 When a file changed by
2024 the log messages of relevant merged commits will then appear in the editor,
2025 where the messages must be further adjusted to convey the reasons for
2026 cherrypicking the changes.
2027 If all the changes in all files touched by a given commit are discarded,
2030 this commit's log message record will also disappear.
2033 will refuse to run if certain preconditions are not met.
2034 If the work tree contains multiple base commits, it must first be updated
2035 to a single base commit with
2037 If any relevant files already contain merge conflicts, these
2038 conflicts must be resolved first.
2046 Display a list of commit log messages recorded by cherrypick operations,
2047 represented by references in the
2048 .Dq refs/got/worktree
2049 reference namespace.
2052 is specified, only show the log message of the specified commit.
2054 If invoked in a work tree, only log messages recorded by cherrypick operations
2055 in the current work tree will be displayed.
2056 Otherwise, all commit log messages will be displayed irrespective of the
2057 work tree in which they were created.
2058 This option cannot be used with
2061 Delete log messages created by previous cherrypick operations, represented by
2063 .Dq refs/got/worktree
2064 reference namespace.
2067 is specified, only delete the log message of the specified commit.
2069 If invoked in a work tree, only log messages recorded by cherrypick operations
2070 in the current work tree will be deleted.
2071 Otherwise, all commit log messages will be deleted irrespective of the
2072 work tree in which they were created.
2073 This option cannot be used with
2084 Reverse-merge changes from a single
2089 should be on the same branch as the work tree's base commit.
2090 The expected argument is a reference or a commit ID SHA1 hash.
2091 An abbreviated hash argument will be expanded to a full SHA1 hash
2092 automatically, provided the abbreviation is unique.
2094 Show the status of each affected file, using the following status codes:
2095 .Bl -column YXZ description
2096 .It G Ta file was merged
2097 .It C Ta file was merged and conflicts occurred during merge
2098 .It ! Ta changes destined for a missing file were not merged
2099 .It D Ta file was deleted
2100 .It d Ta file's deletion was prevented by local modifications
2101 .It A Ta new file was added
2102 .It \(a~ Ta changes destined for a non-regular file were not merged
2103 .It ? Ta changes destined for an unversioned file were not merged
2106 The reverse-merged changes will appear as local changes in the work tree,
2107 which may be viewed with
2109 amended manually or with further
2115 If invoked in a work tree where no
2120 operation is taking place,
2122 creates a record of commits which have been reverse-merged into the work tree.
2123 When a file changed by
2127 the log messages of relevant reverse-merged commits will then appear in
2128 the editor, where the messages must be further adjusted to convey the
2129 reasons for backing out the changes.
2130 If all the changes in all files touched by a given commit are discarded,
2133 this commit's log message record will also disappear.
2136 will refuse to run if certain preconditions are not met.
2137 If the work tree contains multiple base commits, it must first be updated
2138 to a single base commit with
2140 If any relevant files already contain merge conflicts, these
2141 conflicts must be resolved first.
2149 Display a list of commit log messages recorded by backout operations,
2150 represented by references in the
2151 .Dq refs/got/worktree
2152 reference namespace.
2155 is specified, only show the log message of the specified commit.
2157 If invoked in a work tree, only log messages recorded by backout operations
2158 in the current work tree will be displayed.
2159 Otherwise, all commit log messages will be displayed irrespective of the
2160 work tree in which they were created.
2161 This option cannot be used with
2164 Delete log messages created by previous backout operations, represented by
2166 .Dq refs/got/worktree
2167 reference namespace.
2170 is specified, only delete the log message of the specified commit.
2172 If invoked in a work tree, only log messages recorded by backout operations
2173 in the current work tree will be deleted.
2174 Otherwise, all commit log messages will be deleted irrespective of the
2175 work tree in which they were created.
2176 This option cannot be used with
2187 Rebase commits on the specified
2189 onto the tip of the current branch of the work tree.
2192 must share common ancestry with the work tree's current branch.
2193 Rebasing begins with the first descendant commit of the youngest
2194 common ancestor commit shared by the specified
2196 and the work tree's current branch, and stops once the tip commit
2203 is used as intended, the specified
2205 represents a local commit history and may already contain changes
2206 that are not yet visible in any other repositories.
2207 The work tree's current branch, which must be set with
2211 operation, represents a branch from a remote repository which shares
2212 a common history with the specified
2214 but has progressed, and perhaps diverged, due to commits added to the
2217 Rebased commits are accumulated on a temporary branch which the work tree
2218 will remain switched to throughout the entire rebase operation.
2219 Commits on this branch represent the same changes with the same log
2220 messages as their counterparts on the original
2222 but with different commit IDs.
2223 Once rebasing has completed successfully, the temporary branch becomes
2224 the new version of the specified
2226 and the work tree is automatically switched to it.
2227 If author information is available via the
2229 environment variable,
2235 configuration settings, this author information will be used to identify
2240 Old commits in their pre-rebase state are automatically backed up in the
2241 .Dq refs/got/backup/rebase
2242 reference namespace.
2243 As long as these references are not removed older versions of rebased
2244 commits will remain in the repository and can be viewed with the
2247 Removal of these references makes objects which become unreachable via
2248 any reference subject to removal by Git's garbage collector or
2249 .Cm gotadmin cleanup .
2251 While rebasing commits, show the status of each affected file,
2252 using the following status codes:
2253 .Bl -column YXZ description
2254 .It G Ta file was merged
2255 .It C Ta file was merged and conflicts occurred during merge
2256 .It ! Ta changes destined for a missing file were not merged
2257 .It D Ta file was deleted
2258 .It d Ta file's deletion was prevented by local modifications
2259 .It A Ta new file was added
2260 .It \(a~ Ta changes destined for a non-regular file were not merged
2261 .It ? Ta changes destined for an unversioned file were not merged
2264 If merge conflicts occur, the rebase operation is interrupted and may
2265 be continued once conflicts have been resolved.
2266 If any files with destined changes are found to be missing or unversioned,
2267 or if files could not be deleted due to differences in deleted content,
2268 the rebase operation will be interrupted to prevent potentially incomplete
2269 changes from being committed to the repository without user intervention.
2270 The work tree may be modified as desired and the rebase operation can be
2271 continued once the changes present in the work tree are considered complete.
2272 Alternatively, the rebase operation may be aborted which will leave
2274 unmodified and the work tree switched back to its original branch.
2276 If a merge conflict is resolved in a way which renders the merged
2277 change into a no-op change, the corresponding commit will be elided
2278 when the rebase operation continues.
2281 will refuse to run if certain preconditions are not met.
2286 reference namespace, the branch may not be rebased.
2287 If the work tree is not yet fully updated to the tip commit of its
2288 branch, then the work tree must first be updated with
2290 If changes have been staged with
2292 these changes must first be committed with
2296 If the work tree contains local changes, these changes must first be
2303 contains changes to files outside of the work tree's path prefix,
2304 the work tree cannot be used to rebase this branch.
2313 commands will refuse to run while a rebase operation is in progress.
2314 Other commands which manipulate the work tree may be used for
2315 conflict resolution purposes.
2319 is already based on the work tree's current branch, then no commits
2320 need to be rebased and
2322 will simply switch the work tree to the specified
2324 and update files in the work tree accordingly.
2331 Abort an interrupted rebase operation.
2332 If this option is used, no other command-line arguments are allowed.
2334 Continue an interrupted rebase operation.
2335 If this option is used, no other command-line arguments are allowed.
2337 Show a list of past rebase operations, represented by references in the
2338 .Dq refs/got/backup/rebase
2339 reference namespace.
2341 Display the author, date, and log message of each backed up commit,
2342 the object ID of the corresponding post-rebase commit, and
2343 the object ID of their common ancestor commit.
2344 Given these object IDs,
2351 options can be used to examine the history of either version of the branch,
2356 option can be used to create a new branch from a pre-rebase state if desired.
2360 is specified, only show commits which at some point in time represented this
2362 Otherwise, list all backed up commits for any branches.
2364 If this option is used,
2366 does not require a work tree.
2367 None of the other options can be used together with
2370 Delete backups created by past rebase operations, represented by references
2372 .Dq refs/got/backup/rebase
2373 reference namespace.
2377 is specified, only delete backups which at some point in time represented
2379 Otherwise, delete all references found within
2380 .Dq refs/got/backup/rebase .
2382 Any commit, tree, tag, and blob objects belonging to deleted backups
2383 remain in the repository and may be removed separately with
2384 Git's garbage collector or
2385 .Cm gotadmin cleanup .
2387 If this option is used,
2389 does not require a work tree.
2390 None of the other options can be used together with
2397 .Op Fl F Ar histedit-script
2401 Edit commit history between the work tree's current base commit and
2402 the tip commit of the work tree's current branch.
2406 command requires the
2408 environment variable to be set,
2409 unless an author has been configured in
2415 configuration settings can be obtained from the repository's
2417 file or from Git's global
2423 operation, the work tree's current branch must be set with
2425 to the branch which should be edited, unless this branch is already the
2426 current branch of the work tree.
2427 The tip of this branch represents the upper bound (inclusive) of commits
2432 Furthermore, the work tree's base commit
2435 to a point in this branch's commit history where editing should begin.
2436 This commit represents the lower bound (non-inclusive) of commits touched
2441 Editing of commit history is controlled via a
2443 which can be written in an editor based on a template, passed on the
2444 command line, or generated with the
2450 The format of the histedit script is line-based.
2451 Each line in the script begins with a command name, followed by
2452 whitespace and an argument.
2453 For most commands, the expected argument is a commit ID SHA1 hash.
2454 Any remaining text on the line is ignored.
2455 Lines which begin with the
2457 character are ignored entirely.
2459 The available histedit script commands are as follows:
2460 .Bl -column YXZ pick-commit
2461 .It Cm pick Ar commit Ta Use the specified commit as it is.
2462 .It Cm edit Ar commit Ta Use the specified commit but once changes have been
2463 merged into the work tree interrupt the histedit operation for amending.
2464 .It Cm fold Ar commit Ta Combine the specified commit with the next commit
2465 listed further below that will be used.
2466 .It Cm drop Ar commit Ta Remove this commit from the edited history.
2467 .It Cm mesg Oo Ar log-message Oc Ta Create a new log message for the commit of
2472 command on the previous line of the histedit script.
2475 argument provides a new single-line log message to use.
2478 argument is omitted, open an editor where a new log message can be written.
2481 Every commit in the history being edited must be mentioned in the script.
2482 Lines may be re-ordered to change the order of commits in the edited history.
2483 No commit may be listed more than once.
2485 Edited commits are accumulated on a temporary branch which the work tree
2486 will remain switched to throughout the entire histedit operation.
2487 Once history editing has completed successfully, the temporary branch becomes
2488 the new version of the work tree's branch and the work tree is automatically
2491 Old commits in their pre-histedit state are automatically backed up in the
2492 .Dq refs/got/backup/histedit
2493 reference namespace.
2494 As long as these references are not removed older versions of edited
2495 commits will remain in the repository and can be viewed with the
2498 Removal of these references makes objects which become unreachable via
2499 any reference subject to removal by Git's garbage collector or
2500 .Cm gotadmin cleanup .
2502 While merging commits, show the status of each affected file,
2503 using the following status codes:
2504 .Bl -column YXZ description
2505 .It G Ta file was merged
2506 .It C Ta file was merged and conflicts occurred during merge
2507 .It ! Ta changes destined for a missing file were not merged
2508 .It D Ta file was deleted
2509 .It d Ta file's deletion was prevented by local modifications
2510 .It A Ta new file was added
2511 .It \(a~ Ta changes destined for a non-regular file were not merged
2512 .It ? Ta changes destined for an unversioned file were not merged
2515 If merge conflicts occur, the histedit operation is interrupted and may
2516 be continued once conflicts have been resolved.
2517 If any files with destined changes are found to be missing or unversioned,
2518 or if files could not be deleted due to differences in deleted content,
2519 the histedit operation will be interrupted to prevent potentially incomplete
2520 changes from being committed to the repository without user intervention.
2521 The work tree may be modified as desired and the histedit operation can be
2522 continued once the changes present in the work tree are considered complete.
2523 Alternatively, the histedit operation may be aborted which will leave
2524 the work tree switched back to its original branch.
2526 If a merge conflict is resolved in a way which renders the merged
2527 change into a no-op change, the corresponding commit will be elided
2528 when the histedit operation continues.
2531 will refuse to run if certain preconditions are not met.
2532 If the work tree's current branch is not in the
2534 reference namespace, the history of the branch may not be edited.
2535 If the work tree contains multiple base commits, it must first be updated
2536 to a single base commit with
2538 If changes have been staged with
2540 these changes must first be committed with
2544 If the work tree contains local changes, these changes must first be
2549 If the edited history contains changes to files outside of the work tree's
2550 path prefix, the work tree cannot be used to edit the history of this branch.
2558 commands will refuse to run while a histedit operation is in progress.
2559 Other commands which manipulate the work tree may be used, and the
2561 command may be used to commit arbitrary changes to the temporary branch
2562 while the histedit operation is interrupted.
2569 Abort an interrupted histedit operation.
2570 If this option is used, no other command-line arguments are allowed.
2572 Continue an interrupted histedit operation.
2573 If this option is used, no other command-line arguments are allowed.
2576 This option is a quick equivalent to a histedit script which drops all
2580 option can only be used when starting a new histedit operation.
2581 If this option is used, no other command-line arguments are allowed.
2583 Interrupt the histedit operation for editing after merging each commit.
2584 This option is a quick equivalent to a histedit script which uses the
2586 command for all commits.
2589 option can only be used when starting a new histedit operation.
2590 If this option is used, no other command-line arguments are allowed.
2591 .It Fl F Ar histedit-script
2594 instead of opening a temporary file in an editor where a histedit script
2597 Fold all commits into a single commit.
2598 This option is a quick equivalent to a histedit script which folds all
2599 commits, combining them all into one commit.
2602 option can only be used when starting a new histedit operation.
2603 If this option is used, no other command-line arguments are allowed.
2605 Show a list of past histedit operations, represented by references in the
2606 .Dq refs/got/backup/histedit
2607 reference namespace.
2609 Display the author, date, and log message of each backed up commit,
2610 the object ID of the corresponding post-histedit commit, and
2611 the object ID of their common ancestor commit.
2612 Given these object IDs,
2619 options can be used to examine the history of either version of the branch,
2624 option can be used to create a new branch from a pre-histedit state if desired.
2628 is specified, only show commits which at some point in time represented this
2630 Otherwise, list all backed up commits for any branches.
2632 If this option is used,
2634 does not require a work tree.
2635 None of the other options can be used together with
2638 Edit log messages only.
2639 This option is a quick equivalent to a histedit script which edits
2640 only log messages but otherwise leaves every picked commit as-is.
2643 option can only be used when starting a new histedit operation.
2644 If this option is used, no other command-line arguments are allowed.
2646 Delete backups created by past histedit operations, represented by references
2648 .Dq refs/got/backup/histedit
2649 reference namespace.
2653 is specified, only delete backups which at some point in time represented
2655 Otherwise, delete all references found within
2656 .Dq refs/got/backup/histedit .
2658 Any commit, tree, tag, and blob objects belonging to deleted backups
2659 remain in the repository and may be removed separately with
2660 Git's garbage collector or
2661 .Cm gotadmin cleanup .
2663 If this option is used,
2665 does not require a work tree.
2666 None of the other options can be used together with
2670 .It Cm integrate Ar branch
2672 Integrate the specified
2674 into the work tree's current branch.
2675 Files in the work tree are updated to match the contents on the integrated
2677 and the reference of the work tree's branch is changed to point at the
2678 head commit of the integrated
2681 Both branches can be considered equivalent after integration since they
2682 will be pointing at the same commit.
2683 Both branches remain available for future work, if desired.
2684 In case the integrated
2686 is no longer needed it may be deleted with
2689 Show the status of each affected file, using the following status codes:
2690 .Bl -column YXZ description
2691 .It U Ta file was updated
2692 .It D Ta file was deleted
2693 .It A Ta new file was added
2694 .It \(a~ Ta versioned file is obstructed by a non-regular file
2695 .It ! Ta a missing versioned file was restored
2699 will refuse to run if certain preconditions are not met.
2700 Most importantly, the
2702 must have been rebased onto the work tree's current branch with
2704 before it can be integrated, in order to linearize commit history and
2705 resolve merge conflicts.
2706 If the work tree contains multiple base commits, it must first be updated
2707 to a single base commit with
2709 If changes have been staged with
2711 these changes must first be committed with
2715 If the work tree contains local changes, these changes must first be
2727 Create a merge commit based on the current branch of the work tree and
2730 If a linear project history is desired, then use of
2732 should be preferred over
2734 However, even strictly linear projects may require merge commits in order
2735 to merge in new versions of third-party code stored on vendor branches
2739 Merge commits are commits based on multiple parent commits.
2740 The tip commit of the work tree's current branch, which must be set with
2744 operation, will be used as the first parent.
2745 The tip commit of the specified
2747 will be used as the second parent.
2749 No ancestral relationship between the two branches is required.
2750 If the two branches have already been merged previously, only new changes
2753 It is not possible to create merge commits with more than two parents.
2754 If more than one branch needs to be merged, then multiple merge commits
2755 with two parents each can be created in sequence.
2757 While merging changes found on the
2759 into the work tree, show the status of each affected file,
2760 using the following status codes:
2761 .Bl -column YXZ description
2762 .It G Ta file was merged
2763 .It C Ta file was merged and conflicts occurred during merge
2764 .It ! Ta changes destined for a missing file were not merged
2765 .It D Ta file was deleted
2766 .It d Ta file's deletion was prevented by local modifications
2767 .It A Ta new file was added
2768 .It \(a~ Ta changes destined for a non-regular file were not merged
2769 .It ? Ta changes destined for an unversioned file were not merged
2772 If merge conflicts occur, the merge operation is interrupted and conflicts
2773 must be resolved before the merge operation can continue.
2774 If any files with destined changes are found to be missing or unversioned,
2775 or if files could not be deleted due to differences in deleted content,
2776 the merge operation will be interrupted to prevent potentially incomplete
2777 changes from being committed to the repository without user intervention.
2778 The work tree may be modified as desired and the merge can be continued
2779 once the changes present in the work tree are considered complete.
2780 Alternatively, the merge operation may be aborted which will leave
2781 the work tree's current branch unmodified.
2783 If a merge conflict is resolved in a way which renders all merged
2784 changes into no-op changes, the merge operation cannot continue
2785 and must be aborted.
2788 will refuse to run if certain preconditions are not met.
2791 is based on the work tree's current branch, then no merge commit can
2794 may be used to integrate the
2797 If the work tree is not yet fully updated to the tip commit of its
2798 branch, then the work tree must first be updated with
2800 If the work tree contains multiple base commits, it must first be updated
2801 to a single base commit with
2803 If changes have been staged with
2805 these changes must first be committed with
2809 If the work tree contains local changes, these changes must first be
2816 contains changes to files outside of the work tree's path prefix,
2817 the work tree cannot be used to merge this branch.
2827 commands will refuse to run while a merge operation is in progress.
2828 Other commands which manipulate the work tree may be used for
2829 conflict resolution purposes.
2836 Abort an interrupted merge operation.
2837 If this option is used, no other command-line arguments are allowed.
2839 Continue an interrupted merge operation.
2840 If this option is used, no other command-line arguments are allowed.
2842 Merge changes into the work tree as usual but do not create a merge
2844 The merge result can be adjusted as desired before a merge commit is
2847 Alternatively, the merge may be aborted with
2854 .Op Fl F Ar response-script
2858 Stage local changes for inclusion in the next commit.
2861 is specified, stage all changes in the work tree.
2862 Otherwise, stage changes at or within the specified paths.
2863 Paths may be staged if they are added, modified, or deleted according to
2866 Show the status of each affected file, using the following status codes:
2867 .Bl -column YXZ description
2868 .It A Ta file addition has been staged
2869 .It M Ta file modification has been staged
2870 .It D Ta file deletion has been staged
2873 Staged file contents are saved in newly created blob objects in the repository.
2874 These blobs will be referred to by tree objects once staged changes have been
2877 Staged changes affect the behaviour of
2882 While paths with staged changes exist, the
2884 command will refuse to commit any paths which do not have staged changes.
2885 Local changes created on top of staged changes can only be committed if
2886 the path is staged again, or if the staged changes are committed first.
2889 command will show both local changes and staged changes.
2892 command is able to display local changes relative to staged changes,
2893 and to display staged changes relative to the repository.
2896 command cannot revert staged changes but may be used to revert
2897 local changes created on top of staged changes.
2903 .It Fl F Ar response-script
2911 responses line-by-line from the specified
2913 file instead of prompting interactively.
2915 Instead of staging new changes, list paths which are already staged,
2916 along with the IDs of staged blob objects and stage status codes.
2917 If paths were provided on the command line, show the staged paths
2918 among the specified paths.
2919 Otherwise, show all staged paths.
2921 Instead of staging the entire content of a changed file, interactively
2922 select or reject changes for staging based on
2926 (reject change), and
2928 (quit staging this file) responses.
2929 If a file is in modified status, individual patches derived from the
2930 modified file content can be staged.
2931 Files in added or deleted status may only be staged or rejected in
2934 Allow staging of symbolic links which point outside of the path space
2935 that is under version control.
2938 will reject such symbolic links due to safety concerns.
2941 may decide to represent such a symbolic link as a regular file which contains
2942 the link's target path, rather than creating an actual symbolic link which
2943 points outside of the work tree.
2944 Use of this option is discouraged because external mechanisms such as
2946 are better suited for managing symbolic links to paths not under
2951 will refuse to run if certain preconditions are not met.
2952 If a file contains merge conflicts, these conflicts must be resolved first.
2953 If a file is found to be out of date relative to the head commit on the
2954 work tree's current branch, the file must be updated with
2956 before it can be staged (however, this does not prevent the file from
2957 becoming out-of-date at some point after having been staged).
2964 commands will refuse to run while staged changes exist.
2965 If staged changes cannot be committed because a staged path
2966 is out of date, the path must be unstaged with
2968 before it can be updated with
2970 and may then be staged again if necessary.
2975 .Op Fl F Ar response-script
2979 Merge staged changes back into the work tree and put affected paths
2980 back into non-staged status.
2983 is specified, unstage all staged changes across the entire work tree.
2984 Otherwise, unstage changes at or within the specified paths.
2986 Show the status of each affected file, using the following status codes:
2987 .Bl -column YXZ description
2988 .It G Ta file was unstaged
2989 .It C Ta file was unstaged and conflicts occurred during merge
2990 .It ! Ta changes destined for a missing file were not merged
2991 .It D Ta file was staged as deleted and still is deleted
2992 .It d Ta file's deletion was prevented by local modifications
2993 .It \(a~ Ta changes destined for a non-regular file were not merged
3000 .It Fl F Ar response-script
3008 responses line-by-line from the specified
3010 file instead of prompting interactively.
3012 Instead of unstaging the entire content of a changed file, interactively
3013 select or reject changes for unstaging based on
3017 (keep change staged), and
3019 (quit unstaging this file) responses.
3020 If a file is staged in modified status, individual patches derived from the
3021 staged file content can be unstaged.
3022 Files staged in added or deleted status may only be unstaged in their entirety.
3028 .Op Fl r Ar repository-path
3031 Parse and print contents of objects to standard output in a line-based
3033 Content of commit, tree, and tag objects is printed in a way similar
3034 to the actual content stored in such objects.
3035 Blob object contents are printed as they would appear in files on disk.
3037 Attempt to interpret each argument as a reference, a tag name, or
3038 an object ID SHA1 hash.
3039 References will be resolved to an object ID.
3040 Tag names will resolved to a tag object.
3041 An abbreviated hash argument will be expanded to a full SHA1 hash
3042 automatically, provided the abbreviation is unique.
3044 If none of the above interpretations produce a valid result, or if the
3046 option is used, attempt to interpret the argument as a path which will
3047 be resolved to the ID of an object found at this path in the repository.
3054 Look up paths in the specified
3056 If this option is not used, paths are looked up in the commit resolved
3057 via the repository's HEAD reference.
3058 The expected argument is a commit ID SHA1 hash or an existing reference
3059 or tag name which will be resolved to a commit ID.
3060 An abbreviated hash argument will be expanded to a full SHA1 hash
3061 automatically, provided the abbreviation is unique.
3063 Interpret all arguments as paths only.
3064 This option can be used to resolve ambiguity in cases where paths
3065 look like tag names, reference names, or object IDs.
3066 .It Fl r Ar repository-path
3067 Use the repository at the specified path.
3068 If not specified, assume the repository is located at or above the current
3070 If this directory is a
3072 work tree, use the repository path associated with this work tree.
3074 .It Cm info Op Ar path ...
3075 Display meta-data stored in a work tree.
3080 The work tree to use is resolved implicitly by walking upwards from the
3081 current working directory.
3085 arguments are specified, show additional per-file information for tracked
3086 files located at or within these paths.
3089 argument corresponds to the work tree's root directory, display information
3090 for all tracked files.
3093 .Bl -tag -width GOT_IGNORE_GITCONFIG
3095 The author's name and email address, such as
3096 .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
3106 may fail to parse commits without an email address in author data,
3110 environment variables with a missing email address.
3112 .Ev GOT_AUTHOR will be overridden by configuration settings in
3118 configuration settings in the repository's
3125 configuration settings contained in Git's global
3127 configuration file will only be used if neither
3131 environment variable provide author information.
3132 .It Ev GOT_IGNORE_GITCONFIG
3133 If this variable is set then any remote repository definitions or author
3134 information found in Git configuration files will be ignored.
3135 .It Ev GOT_LOG_DEFAULT_LIMIT
3136 The default limit on the number of commits traversed by
3138 If set to zero, the limit is unbounded.
3139 This variable will be silently ignored if it is set to a non-numeric value.
3140 .It Ev VISUAL , EDITOR
3141 The editor spawned by
3149 text editor will be spawned in order to give
3151 the attention it deserves.
3154 .Bl -tag -width packed-refs -compact
3156 Repository-wide configuration settings for
3160 configuration file located in the root directory of a Git repository
3161 supersedes any relevant settings in Git's
3165 .It Pa .got/got.conf
3166 Worktree-specific configuration settings for
3170 configuration file in the
3172 meta-data directory of a work tree supersedes any relevant settings in
3175 configuration file and Git's
3182 Enable tab-completion of
3187 .Dl $ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
3189 Clone an existing Git repository for use with
3193 .Dl $ got clone ssh://git@github.com/openbsd/src.git
3195 Use of HTTP URLs currently requires
3199 .Dl $ git clone --bare https://github.com/openbsd/src.git
3201 Alternatively, for quick and dirty local testing of
3203 a new Git repository could be created and populated with files,
3204 e.g. from a temporary CVS checkout located at
3207 .Dl $ gotadmin init /var/git/src.git
3208 .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
3210 Check out a work tree from the Git repository to /usr/src:
3212 .Dl $ got checkout /var/git/src.git /usr/src
3214 View local changes in a work tree directory:
3216 .Dl $ got diff | less
3218 In a work tree, display files in a potentially problematic state:
3220 .Dl $ got status -s 'C!~?'
3222 Interactively revert selected local changes in a work tree directory:
3224 .Dl $ got revert -p -R\ .
3226 In a work tree or a git repository directory, list all branch references:
3230 As above, but list the most recently modified branches only:
3232 .Dl $ got branch -lt | head
3234 In a work tree or a git repository directory, create a new branch called
3235 .Dq unified-buffer-cache
3236 which is forked off the
3240 .Dl $ got branch -c master unified-buffer-cache
3242 Switch an existing work tree to the branch
3243 .Dq unified-buffer-cache .
3244 Local changes in the work tree will be preserved and merged if necessary:
3246 .Dl $ got update -b unified-buffer-cache
3248 Create a new commit from local changes in a work tree directory.
3249 This new commit will become the head commit of the work tree's current branch:
3253 In a work tree or a git repository directory, view changes committed in
3254 the 3 most recent commits to the work tree's branch, or the branch resolved
3255 via the repository's HEAD reference, respectively:
3257 .Dl $ got log -p -l 3
3259 As above, but display changes in the order in which
3261 could apply them in sequence:
3263 .Dl $ got log -p -l 3 -R
3265 In a work tree or a git repository directory, log the history of a subdirectory:
3267 .Dl $ got log sys/uvm
3269 While operating inside a work tree, paths are specified relative to the current
3270 working directory, so this command will log the subdirectory
3273 .Dl $ cd sys/uvm && got log\ .
3275 And this command has the same effect:
3277 .Dl $ cd sys/dev/usb && got log ../../uvm
3279 And this command displays work tree meta-data about all tracked files:
3282 .Dl $ got info\ . | less
3284 Add new files and remove obsolete files in a work tree directory:
3286 .Dl $ got add sys/uvm/uvm_ubc.c
3287 .Dl $ got remove sys/uvm/uvm_vnode.c
3289 Create a new commit from local changes in a work tree directory
3290 with a pre-defined log message.
3292 .Dl $ got commit -m 'unify the buffer cache'
3294 Alternatively, create a new commit from local changes in a work tree
3295 directory with a log message that has been prepared in the file
3298 .Dl $ got commit -F /tmp/msg
3300 Update any work tree checked out from the
3301 .Dq unified-buffer-cache
3302 branch to the latest commit on this branch:
3306 Roll file content on the unified-buffer-cache branch back by one commit,
3307 and then fetch the rolled-back change into the work tree as a local change
3308 to be amended and perhaps committed again:
3310 .Dl $ got backout unified-buffer-cache
3311 .Dl $ got commit -m 'roll back previous'
3312 .Dl $ # now back out the previous backout :-)
3313 .Dl $ got backout unified-buffer-cache
3315 Fetch new changes on the remote repository's
3317 branch, making them visible on the local repository's
3324 In a repository created with a HTTP URL and
3325 .Cm git clone --bare
3328 command must be used instead:
3330 .Dl $ cd /var/git/src.git
3331 .Dl $ git fetch origin master:refs/remotes/origin/master
3335 branch to merge the new changes that are now visible on the
3340 .Dl $ got update -b origin/master
3341 .Dl $ got rebase master
3344 .Dq unified-buffer-cache
3345 branch on top of the new head commit of the
3349 .Dl $ got update -b master
3350 .Dl $ got rebase unified-buffer-cache
3352 Create a patch from all changes on the unified-buffer-cache branch.
3353 The patch can be mailed out for review and applied to
3357 .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
3359 Edit the entire commit history of the
3360 .Dq unified-buffer-cache
3363 .Dl $ got update -b unified-buffer-cache
3364 .Dl $ got update -c master
3367 Before working against existing branches in a repository cloned with
3368 .Cm git clone --bare
3373 must be configured to map all references in the remote repository
3376 namespace of the local repository.
3377 This can be achieved by setting Git's
3378 .Pa remote.origin.fetch
3379 configuration variable to the value
3380 .Dq +refs/heads/*:refs/remotes/origin/*
3385 .Dl $ cd /var/git/repo
3386 .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
3390 option must be disabled:
3392 .Dl $ cd /var/git/repo
3393 .Dl $ git config remote.origin.mirror false
3395 Alternatively, the following
3397 configuration item can be added manually to the Git repository's
3401 .Dl [remote \&"origin\&"]
3403 .Dl fetch = +refs/heads/*:refs/remotes/origin/*
3406 This configuration leaves the local repository's
3408 namespace free for use by local branches checked out with
3410 and, if needed, created with
3413 .Dq refs/remotes/origin
3414 namespace can now be updated with incoming changes from the remote
3419 without extra command line arguments.
3420 Newly fetched changes can be examined with
3423 Display changes on the remote repository's version of the
3425 branch, as of the last time
3429 .Dl $ got log -c origin/master | less
3431 As shown here, most commands accept abbreviated reference names such as
3434 .Dq refs/remotes/origin/master .
3435 The latter is only needed in case of ambiguity.
3438 must be used to merge changes which are visible on the
3443 This will also merge local changes, if any, with the incoming changes:
3445 .Dl $ got update -b origin/master
3446 .Dl $ got rebase master
3448 In order to make changes committed to the
3449 .Dq unified-buffer-cache
3453 .Dq unified-buffer-cache
3454 branch must first be rebased onto the
3458 .Dl $ got update -b master
3459 .Dl $ got rebase unified-buffer-cache
3462 .Dq unified-buffer-cache
3463 branch can now be made visible on the
3467 Because the rebase operation switched the work tree to the
3468 .Dq unified-buffer-cache
3469 branch, the work tree must be switched back to the
3473 .Dl $ got update -b master
3474 .Dl $ got integrate unified-buffer-cache
3478 branch, log messages for local changes can now be amended with
3480 by other developers and any other important new information:
3482 .Dl $ got update -c origin/master
3483 .Dl $ got histedit -m
3485 If the remote repository offers write access, local changes on the
3487 branch can be sent to the remote repository with
3491 can be run without further arguments.
3492 The arguments shown here match defaults, provided the work tree's
3493 current branch is the
3497 .Dl $ got send -b master origin
3499 If the remote repository requires the HTTPS protocol, the
3501 command must be used instead:
3503 .Dl $ cd /var/git/src.git
3504 .Dl $ git push origin master
3506 When making contributions to projects which use the
3508 workflow, SSH protocol repository access needs to be set up first.
3509 Once an account has been created on a Git hosting site it should
3510 be possible to upload a public SSH key for repository access
3515 workflow will usually involve two remote repositories.
3516 In the real-life example below, the
3518 repository was forked from the
3520 repository by using the Git hosting site's web interface.
3523 file in the local repository describes both remote repositories:
3524 .Bd -literal -offset indent
3525 # Jelmers's repository, which accepts pull requests
3527 server git@github.com
3529 repository "/jelmer/dulwich"
3533 # Stefan's fork, used as the default remote repository
3535 server git@github.com
3537 repository "/stspdotname/dulwich"
3542 With this configuration, Stefan can create commits on
3543 .Dq refs/heads/master
3544 and send them to the
3546 repository by running:
3548 .Dl $ got send -b master origin
3550 The changes can now be proposed to Jelmer by opening a pull request
3551 via the Git hosting site's web interface.
3552 If Jelmer requests further changes to be made, additional commits
3553 can be created on the
3555 branch and be added to the pull request by running
3559 If Jelmer prefers additional commits to be
3561 then the following commands can be used to achieve this:
3563 .Dl $ got update -b master
3564 .Dl $ got update -c origin/master
3565 .Dl $ got histedit -f
3566 .Dl $ got send -f -b master origin
3568 Once Jelmer has accepted the pull request, Stefan can fetch the
3569 merged changes, and possibly several other new changes, by running:
3571 .Dl $ got fetch upstream
3573 The merged changes will now be visible under the reference
3574 .Dq refs/remotes/upstream/master .
3577 branch can now be rebased on top of the latest changes
3580 .Dl $ got update -b upstream/master
3581 .Dl $ got rebase master
3583 As a final step, the forked repository's copy of the master branch needs
3584 to be kept in sync by sending the new changes there:
3586 .Dl $ got send -f -b master origin
3588 If multiple pull requests need to be managed in parallel, a separate branch
3589 must be created for each pull request with
3591 Each such branch can then be used as above, in place of
3592 .Dq refs/heads/master .
3593 Changes for any accepted pull requests will still appear under
3594 .Dq refs/remotes/upstream/master,
3595 regardless of which branch was used in the forked repository to
3596 create a pull request.
3600 .Xr git-repository 5 ,
3601 .Xr got-worktree 5 ,
3605 .An Anthony J. Bentley Aq Mt bentley@openbsd.org
3606 .An Christian Weisgerber Aq Mt naddy@openbsd.org
3607 .An Hiltjo Posthuma Aq Mt hiltjo@codemadness.org
3608 .An Josh Rickmar Aq Mt jrick@zettaport.com
3609 .An Joshua Stein Aq Mt jcs@openbsd.org
3610 .An Klemens Nanni Aq Mt kn@openbsd.org
3611 .An Martin Pieuchot Aq Mt mpi@openbsd.org
3612 .An Neels Hofmeyr Aq Mt neels@hofmeyr.de
3613 .An Omar Polo Aq Mt op@openbsd.org
3614 .An Ori Bernstein Aq Mt ori@openbsd.org
3615 .An Sebastien Marie Aq Mt semarie@openbsd.org
3616 .An Stefan Sperling Aq Mt stsp@openbsd.org
3617 .An Steven McDonald Aq Mt steven@steven-mcdonald.id.au
3618 .An Theo Buehler Aq Mt tb@openbsd.org
3619 .An Thomas Adam Aq Mt thomas@xteddy.org
3620 .An Tracey Emery Aq Mt tracey@traceyemery.net
3621 .An Yang Zhong Aq Mt yzhong@freebsdfoundation.org
3628 were derived from code under copyright by:
3630 .An Caldera International
3631 .An Daniel Hartmeier
3636 .An Jean-Francois Brousseau
3642 .An Niklas Hallqvist
3647 .An Xavier Santolaria
3650 contains code contributed to the public domain by
3651 .An Austin Appleby .
3654 is a work-in-progress and some features remain to be implemented.
3656 At present, the user has to fall back on
3658 to perform some tasks.
3662 Reading from remote repositories over HTTP or HTTPS protocols requires
3667 Writing to remote repositories over HTTP or HTTPS protocols requires
3670 The creation of merge commits with more than two parent commits requires
3673 In situations where files or directories were moved around
3675 will not automatically merge changes to new locations and
3677 will usually produce better results.
