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
66 .It Cm import Oo Fl b Ar branch Oc Oo Fl m Ar message Oc Oo Fl r Ar repository-path Oc Oo Fl I Ar pattern Oc Ar directory
68 Create an initial commit in a repository from the file hierarchy
71 The created commit will not have any parent commits, i.e. it will be a
73 Also create a new reference which provides a branch name for the newly
75 Show the path of each imported file to indicate progress.
81 environment variable to be set,
82 unless an author has been configured in
88 configuration settings can be obtained from the repository's
90 file or from Git's global
101 instead of creating the default branch
103 Use of this option is required if the
105 branch already exists.
107 Use the specified log message when creating the new commit.
112 opens a temporary file in an editor where a log message can be written.
113 .It Fl r Ar repository-path
114 Use the repository at the specified path.
115 If not specified, assume the repository is located at or above the current
118 Ignore files or directories with a name which matches the specified
120 This option may be specified multiple times to build a list of ignore patterns.
123 follows the globbing rules documented in
127 .It Cm clone Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl l Oc Oo Fl m Oc Oo Fl q Oc Oo Fl v Oc Oo Fl R Ar reference Oc Ar repository-URL Op Ar directory
129 Clone a Git repository at the specified
135 is specified, the directory name will be derived from the name of the
138 will refuse to run if the
144 specifies a protocol scheme, a server hostname, an optional port number
145 separated from the hostname by a colon, and a path to the repository on
147 .Lk scheme://hostname:port/path/to/repository
149 The following protocol schemes are supported:
150 .Bl -tag -width git+ssh
152 The Git protocol as implemented by the
155 Use of this protocol is discouraged since it supports neither authentication
158 The Git protocol wrapped in an authenticated and encrypted
161 With this protocol the hostname may contain an embedded username for
166 Short alias for git+ssh.
169 Objects in the cloned repository are stored in a pack file which is downloaded
171 This pack file will then be indexed to facilitate access to the objects stored
173 If any objects in the pack file are stored in deltified form, all deltas will
174 be fully resolved in order to compute the ID of such objects.
175 This can take some time.
176 More details about the pack file format are documented in
177 .Xr git-repository 5 .
180 creates a remote repository entry in the
184 files of the cloned repository to store the
190 arguments for future use by
200 Fetch all branches from the remote repository's
202 reference namespace and set
203 .Cm fetch_all_branches
204 in the cloned repository's
206 file for future use by
208 If this option is not specified, a branch resolved via the remote
209 repository's HEAD reference will be fetched.
210 Cannot be used together with the
216 from the remote repository's
219 This option may be specified multiple times to build a list of branches
221 If the branch corresponding to the remote repository's HEAD reference is not
222 in this list, the cloned repository's HEAD reference will be set to the first
223 branch which was fetched.
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
230 List branches and tags available for fetching from the remote repository
231 and exit immediately.
232 Cannot be used together with any of the other options except
237 Create the cloned repository as a mirror of the original repository.
238 This is useful if the cloned repository will not be used to store
239 locally created commits.
245 files will be set up with the
247 option enabled, such that
251 will write incoming changes directly to branches in the
253 reference namespace, rather than to branches in the
256 This avoids the usual requirement of having to run
260 in order to make incoming changes appear on branches in the
263 But maintaining custom changes in the cloned repository becomes difficult
264 since such changes will be at risk of being discarded whenever incoming
267 Suppress progress reporting output.
268 The same option will be passed to
275 to print debugging messages to standard error output.
276 This option will be passed to
279 Multiple -v options increase the verbosity.
281 .It Fl R Ar reference
282 In addition to the branches and tags that will be fetched, fetch an arbitrary
284 from the remote repository's
287 This option may be specified multiple times to build a list of additional
291 may either be a path to a specific reference, or a reference namespace
292 which will cause all references in this namespace to be fetched.
294 Each reference will be mapped into the cloned repository's
296 namespace, unless the
298 option is used to mirror references directly into the cloned repository's
303 will refuse to fetch references from the remote repository's
310 .It Cm fetch Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl d Oc Oo Fl l Oc Oo Fl r Ar repository-path Oc Oo Fl t Oc Oo Fl q Oc Oo Fl v Oc Oo Fl R Ar reference Oc Oo Fl X Oc Op Ar remote-repository
312 Fetch new changes from a remote repository.
314 .Ar remote-repository
318 The remote repository's URL is obtained from the corresponding entry in
322 file of the local repository, as created by
325 New changes will be stored in a separate pack file downloaded from the server.
326 Optionally, separate pack files stored in the repository can be combined with
329 By default, branch references in the
331 reference namespace will be updated to point at the newly fetched commits.
334 command can then be used to make new changes visible on branches in the
336 namespace, merging incoming changes with the changes on those branches
339 If the repository was created as a mirror with
341 then all branches in the
343 namespace will be updated directly to match the corresponding branches in
344 the remote repository.
345 If those branches contained local commits, these commits will no longer be
346 reachable via a reference and will therefore be at risk of being discarded
347 by Git's garbage collector or
348 .Cm gotadmin cleanup .
349 Maintaining custom changes in a mirror repository is therefore discouraged.
351 In any case, references in the
353 namespace will always be fetched and mapped directly to local references
354 in the same namespace.
361 Fetch all branches from the remote repository's
364 This option can be enabled by default for specific repositories in
366 If this option is not specified, a branch resolved via the remote
367 repository's HEAD reference will be fetched.
368 Cannot be used together with the
374 from the remote repository's
377 This option may be specified multiple times to build a list of branches
379 If this option is not specified, a branch resolved via the remote
380 repository's HEAD reference will be fetched.
381 Cannot be used together with the
385 Delete branches and tags from the local repository which are no longer
386 present in the remote repository.
387 Only references are deleted.
388 Any commit, tree, tag, and blob objects belonging to deleted branches or
389 tags remain in the repository and may be removed separately with
390 Git's garbage collector or
391 .Cm gotadmin cleanup .
393 List branches and tags available for fetching from the remote repository
394 and exit immediately.
395 Cannot be used together with any of the other options except
401 Allow existing references in the
403 namespace to be updated if they have changed on the server.
404 If not specified, only new tag references will be created.
405 .It Fl r Ar repository-path
406 Use the repository at the specified path.
407 If not specified, assume the repository is located at or above the current
409 If this directory is a
411 work tree, use the repository path associated with this work tree.
413 Suppress progress reporting output.
414 The same option will be passed to
421 to print debugging messages to standard error output.
422 The same option will be passed to
425 Multiple -v options increase the verbosity.
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
459 Delete all references which correspond to a particular
460 .Ar remote-repository
461 instead of fetching new changes.
462 This can be useful when a remote repository is being removed from
468 .Ar remote-repository
469 argument is mandatory and no other options except
476 Only references are deleted.
477 Any commit, tree, tag, and blob objects fetched from a remote repository
478 will generally be stored in pack files and may be removed separately with
480 and Git's garbage collector.
483 .It Cm checkout Oo Fl E Oc Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Oo Fl p Ar path-prefix Oc Oo Fl q Oc Ar repository-path Op Ar work-tree-path
485 Copy files from a repository into a new work tree.
486 Show the status of each affected file, using the following status codes:
487 .Bl -column YXZ description
488 .It A Ta new file was added
489 .It E Ta file already exists in work tree's meta-data
494 is not specified, either use the last component of
495 .Ar repository path ,
498 was specified use the last component of
506 Proceed with the checkout operation even if the directory at
509 Existing files will be left intact.
511 Check out files from a commit on the specified
513 If this option is not specified, a branch resolved via the repository's HEAD
514 reference will be used.
516 Check out files from the specified
518 on the selected branch.
519 The expected argument is a commit ID SHA1 hash or an existing reference
520 or tag name which will be resolved to a commit ID.
521 An abbreviated hash argument will be expanded to a full SHA1 hash
522 automatically, provided the abbreviation is unique.
523 If this option is not specified, the most recent commit on the selected
528 is not contained in the selected branch, a different branch which contains
529 this commit must be specified with the
532 If no such branch is known, a new branch must be created for this
538 Checking out work trees with an unknown branch is intentionally not supported.
539 .It Fl p Ar path-prefix
540 Restrict the work tree to a subset of the repository's tree hierarchy.
541 Only files beneath the specified
545 Silence progress output.
548 .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Oo Fl q Oc Op Ar path ...
550 Update an existing work tree to a different
552 Change existing files in the work tree as necessary to match file contents
554 Preserve any local changes in the work tree and merge them with the
557 Files which already contain merge conflicts will not be updated to avoid
558 further complications.
559 Such files will be updated when
561 is run again after merge conflicts have been resolved.
562 If the conflicting changes are no longer needed, affected files can be
569 Show the status of each affected file, using the following status codes:
570 .Bl -column YXZ description
571 .It U Ta file was updated and contained no local changes
572 .It G Ta file was updated and local changes were merged cleanly
573 .It C Ta file was updated and conflicts occurred during merge
574 .It D Ta file was deleted
575 .It A Ta new file was added
576 .It \(a~ Ta versioned file is obstructed by a non-regular file
577 .It ! Ta a missing versioned file was restored
578 .It # Ta file was not updated because it contains merge conflicts
579 .It ? Ta changes destined for an unversioned file were not merged
584 is specified, update the entire work tree.
585 Otherwise, restrict the update operation to files at or within the
587 Each path is required to exist in the update operation's target commit.
588 Files in the work tree outside specified paths will remain unchanged and
589 will retain their previously recorded base commit.
592 commands may refuse to run while the work tree contains files from
593 multiple base commits.
594 The base commit of such a work tree can be made consistent by running
596 across the entire work tree.
599 is incompatible with the
604 cannot update paths with staged changes.
605 If changes have been staged with
607 these changes must first be committed with
617 Switch the work tree's branch reference to the specified
619 before updating the work tree.
620 This option requires that all paths in the work tree are updated.
622 As usual, any local changes in the work tree will be preserved.
623 This can be useful when switching to a newly created branch in order
624 to commit existing local changes to this branch.
626 Any local changes must be dealt with separately in order to obtain a
627 work tree with pristine file contents corresponding exactly to the specified
629 Such changes could first be committed to a different branch with
631 or could be discarded with
634 Update the work tree to the specified
636 The expected argument is a commit ID SHA1 hash or an existing reference
637 or tag name which will be resolved to a commit ID.
638 An abbreviated hash argument will be expanded to a full SHA1 hash
639 automatically, provided the abbreviation is unique.
640 If this option is not specified, the most recent commit on the work tree's
643 Silence progress output.
646 .It Cm status Oo Fl I Oc Oo Fl s Ar status-codes Oc Oo Fl S Ar status-codes Oc Op Ar path ...
648 Show the current modification status of files in a work tree,
649 using the following status codes:
650 .Bl -column YXZ description
651 .It M Ta modified file
652 .It A Ta file scheduled for addition in next commit
653 .It D Ta file scheduled for deletion in next commit
654 .It C Ta modified or added file which contains merge conflicts
655 .It ! Ta versioned file was expected on disk but is missing
656 .It \(a~ Ta versioned file is obstructed by a non-regular file
657 .It ? Ta unversioned item not tracked by
659 .It m Ta modified file modes (executable bit only)
660 .It N Ta non-existent
662 specified on the command line
667 is specified, show modifications in the entire work tree.
668 Otherwise, show modifications at or within the specified paths.
670 If changes have been staged with
672 staged changes are shown in the second output column, using the following
674 .Bl -column YXZ description
675 .It M Ta file modification is staged
676 .It A Ta file addition is staged
677 .It D Ta file deletion is staged
680 Changes created on top of staged changes are indicated in the first column:
681 .Bl -column YXZ description
682 .It MM Ta file was modified after earlier changes have been staged
683 .It MA Ta file was modified after having been staged for addition
691 Show unversioned files even if they match an ignore pattern.
692 .It Fl s Ar status-codes
693 Only show files with a modification status matching any of the
694 single-character status codes contained in the
697 Any combination of codes from the above list of possible status codes
699 For staged files, status codes displayed in either column will be matched.
700 Cannot be used together with the
703 .It Fl S Ar status-codes
704 Suppress the output of files with a modification status matching any of the
705 single-character status codes contained in the
708 Any combination of codes from the above list of possible status codes
710 For staged files, status codes displayed in either column will be matched.
711 Cannot be used together with the
716 For compatibility with
727 files in each traversed directory and will not display unversioned files
728 which match these patterns.
733 supports consecutive asterisks,
735 which will match an arbitrary amount of directories.
739 only supports a single ignore pattern per line.
743 does not support negated ignore patterns prefixed with
745 and gives no special significance to the location of path component separators,
748 .It Cm log Oo Fl b Oc Oo Fl c Ar commit Oc Oo Fl C Ar number Oc Oo Fl l Ar N Oc Oo Fl p Oc Oo Fl P Oc Oo Fl s Oc Oo Fl S Ar search-pattern Oc Oo Fl r Ar repository-path Oc Oo Fl R Oc Oo Fl x Ar commit Oc Op Ar path
749 Display history of a repository.
752 is specified, show only commits which modified this path.
753 If invoked in a work tree, the
755 is interpreted relative to the current working directory,
756 and the work tree's path prefix is implicitly prepended.
757 Otherwise, the path is interpreted relative to the repository root.
764 Display individual commits which were merged into the current branch
768 shows the linear history of the current branch only.
770 Start traversing history at the specified
772 The expected argument is a commit ID SHA1 hash or an existing reference
773 or tag name which will be resolved to a commit ID.
774 An abbreviated hash argument will be expanded to a full SHA1 hash
775 automatically, provided the abbreviation is unique.
776 If this option is not specified, default to the work tree's current branch
777 if invoked in a work tree, or to the repository's HEAD reference.
779 Set the number of context lines shown in diffs with
781 By default, 3 lines of context are shown.
783 Limit history traversal to a given number of commits.
784 If this option is not specified, a default limit value of zero is used,
785 which is treated as an unbounded limit.
787 .Ev GOT_LOG_DEFAULT_LIMIT
788 environment variable may be set to change this default value.
790 Display the patch of modifications made in each commit.
793 is specified, only show the patch of modifications at or within this path.
794 Cannot be used with the
798 Display the list of file paths changed in each commit, using the following
800 .Bl -column YXZ description
801 .It M Ta modified file
802 .It D Ta file was deleted
803 .It A Ta new file was added
804 .It m Ta modified file modes (executable bit only)
807 Cannot be used with the
811 Display a short one-line summary of each commit, instead of the default
813 Cannot be used together with the
818 .It Fl S Ar search-pattern
819 If specified, show only commits with a log message, author name,
820 committer name, or ID SHA1 hash matched by the extended regular
823 Lines in committed patches will be matched if
826 File paths changed by a commit will be matched if
829 Regular expression syntax is documented in
831 .It Fl r Ar repository-path
832 Use the repository at the specified path.
833 If not specified, assume the repository is located at or above the current
835 If this directory is a
837 work tree, use the repository path associated with this work tree.
839 Determine a set of commits to display as usual, but display these commits
842 Stop traversing commit history immediately after the specified
845 This option has no effect if the specified
850 .It Cm diff Oo Fl a Oc Oo Fl c Ar commit Oc Oo Fl C Ar number Oc Oo Fl r Ar repository-path Oc Oo Fl s Oc Oo Fl P Oc Oo Fl w Oc Op Ar object1 Ar object2 | Ar path ...
852 When invoked within a work tree without any arguments, display all
853 local changes in the work tree.
856 arguments are specified, only show changes within the specified paths.
858 If two arguments are provided, treat each argument as a reference, a tag
859 name, or an object ID SHA1 hash, and display differences between the
860 corresponding objects.
861 Both objects must be of the same type (blobs, trees, or commits).
862 An abbreviated hash argument will be expanded to a full SHA1 hash
863 automatically, provided the abbreviation is unique.
864 If none of these interpretations produce a valid result or if the
869 is running in a work tree, attempt to interpret the two arguments as paths.
876 Treat file contents as ASCII text even if binary data is detected.
878 Show differences between commits in the repository.
879 This options may be used up to two times.
880 When used only once, show differences between the specified
882 and its first parent commit.
883 When used twice, show differences between the two specified commits.
885 The expected argument is a commit ID SHA1 hash or an existing reference
886 or tag name which will be resolved to a commit ID.
887 An abbreviated hash argument will be expanded to a full SHA1 hash
888 automatically, provided the abbreviation is unique.
892 option is used, all non-option arguments will be interpreted as paths.
895 arguments are provided, only show differences for the specified paths.
897 Cannot be used together with the
901 Set the number of context lines shown in the diff.
902 By default, 3 lines of context are shown.
903 .It Fl r Ar repository-path
904 Use the repository at the specified path.
905 If not specified, assume the repository is located at or above the current
907 If this directory is a
909 work tree, use the repository path associated with this work tree.
911 Show changes staged with
913 instead of showing local changes in the work tree.
914 This option is only valid when
916 is invoked in a work tree.
918 Interpret all arguments as paths only.
919 This option can be used to resolve ambiguity in cases where paths
920 look like tag names, reference names, or object IDs.
921 This option is only valid when
923 is invoked in a work tree.
925 Ignore whitespace-only changes.
928 .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path
930 Display line-by-line history of a file at the specified path.
937 Start traversing history at the specified
939 The expected argument is a commit ID SHA1 hash or an existing reference
940 or tag name which will be resolved to a commit ID.
941 An abbreviated hash argument will be expanded to a full SHA1 hash
942 automatically, provided the abbreviation is unique.
943 .It Fl r Ar repository-path
944 Use the repository at the specified path.
945 If not specified, assume the repository is located at or above the current
947 If this directory is a
949 work tree, use the repository path associated with this work tree.
952 .It Cm tree Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl i Oc Oo Fl R Oc Op Ar path
954 Display a listing of files and directories at the specified
955 directory path in the repository.
956 Entries shown in this listing may carry one of the following trailing
958 .Bl -column YXZ description
959 .It @ Ta entry is a symbolic link
960 .It / Ta entry is a directory
961 .It * Ta entry is an executable file
962 .It $ Ta entry is a Git submodule
965 Symbolic link entries are also annotated with the target path of the link.
969 is specified, list the repository path corresponding to the current
970 directory of the work tree, or the root directory of the repository
971 if there is no work tree.
978 List files and directories as they appear in the specified
980 The expected argument is a commit ID SHA1 hash or an existing reference
981 or tag name which will be resolved to a commit ID.
982 An abbreviated hash argument will be expanded to a full SHA1 hash
983 automatically, provided the abbreviation is unique.
984 .It Fl r Ar repository-path
985 Use the repository at the specified path.
986 If not specified, assume the repository is located at or above the current
988 If this directory is a
990 work tree, use the repository path associated with this work tree.
992 Show object IDs of files (blob objects) and directories (tree objects).
994 Recurse into sub-directories in the repository.
996 .It Cm ref Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl t Oc Oo Fl c Ar object Oc Oo Fl s Ar reference Oc Oo Fl d Oc Op Ar name
997 Manage references in a repository.
999 References may be listed, created, deleted, and changed.
1000 When creating, deleting, or changing a reference the specified
1002 must be an absolute reference name, i.e. it must begin with
1009 .It Fl r Ar repository-path
1010 Use the repository at the specified path.
1011 If not specified, assume the repository is located at or above the current
1013 If this directory is a
1015 work tree, use the repository path associated with this work tree.
1017 List references in the repository.
1020 is specified, list all existing references in the repository.
1023 is a reference namespace, list all references in this namespace.
1024 Otherwise, show only the reference with the given
1026 Cannot be used together with any other options except
1031 Sort listed references by modification time (most recently modified first)
1032 instead of sorting by lexicographical order.
1033 Use of this option requires the
1035 option to be used as well.
1037 Create a reference or change an existing reference.
1038 The reference with the specified
1040 will point at the specified
1044 argument is a ID SHA1 hash or an existing reference or tag name which will
1045 be resolved to the ID of a corresponding commit, tree, tag, or blob object.
1046 Cannot be used together with any other options except
1048 .It Fl s Ar reference
1049 Create a symbolic reference, or change an existing symbolic reference.
1050 The symbolic reference with the specified
1052 will point at the specified
1054 which must already exist in the repository.
1055 Care should be taken not to create loops between references when
1056 this option is used.
1057 Cannot be used together with any other options except
1060 Delete the reference with the specified
1062 from the repository.
1063 Any commit, tree, tag, and blob objects belonging to deleted references
1064 remain in the repository and may be removed separately with
1065 Git's garbage collector or
1066 .Cm gotadmin cleanup .
1067 Cannot be used together with any other options except
1071 .It Cm branch Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl t Oc Oo Fl d Ar name Oc Oo Fl n Oc Op Ar name
1073 Create, list, or delete branches.
1075 Local branches are managed via references which live in the
1077 reference namespace.
1080 command creates references in this namespace only.
1082 When deleting branches, the specified
1086 reference namespace first.
1087 If no corresponding branch is found, the
1089 namespace will be searched next.
1091 If invoked in a work tree without any arguments, print the name of the
1092 work tree's current branch.
1096 argument is passed, attempt to create a branch reference with the given name.
1097 By default the new branch reference will point at the latest commit on the
1098 work tree's current branch if invoked in a work tree, and otherwise to a commit
1099 resolved via the repository's HEAD reference.
1101 If invoked in a work tree, once the branch was created successfully
1102 switch the work tree's head reference to the newly created branch and
1103 update files across the entire work tree, just like
1104 .Cm got update -b Ar name
1106 Show the status of each affected file, using the following status codes:
1107 .Bl -column YXZ description
1108 .It U Ta file was updated and contained no local changes
1109 .It G Ta file was updated and local changes were merged cleanly
1110 .It C Ta file was updated and conflicts occurred during merge
1111 .It D Ta file was deleted
1112 .It A Ta new file was added
1113 .It \(a~ Ta versioned file is obstructed by a non-regular file
1114 .It ! Ta a missing versioned file was restored
1122 Make a newly created branch reference point at the specified
1126 argument is a commit ID SHA1 hash or an existing reference
1127 or tag name which will be resolved to a commit ID.
1128 .It Fl r Ar repository-path
1129 Use the repository at the specified path.
1130 If not specified, assume the repository is located at or above the current
1132 If this directory is a
1134 work tree, use the repository path associated with this work tree.
1136 List all existing branches in the repository, including copies of remote
1137 repositories' branches in the
1139 reference namespace.
1141 If invoked in a work tree, the work tree's current branch is shown
1142 with one the following annotations:
1143 .Bl -column YXZ description
1144 .It * Ta work tree's base commit matches the branch tip
1145 .It \(a~ Ta work tree's base commit is out-of-date
1148 Sort listed branches by modification time (most recently modified first)
1149 instead of sorting by lexicographical order.
1152 reference namespace are listed before branches in
1155 Use of this option requires the
1157 option to be used as well.
1159 Delete the branch with the specified
1165 reference namespace.
1167 Only the branch reference is deleted.
1168 Any commit, tree, and blob objects belonging to the branch
1169 remain in the repository and may be removed separately with
1170 Git's garbage collector or
1171 .Cm gotadmin cleanup .
1173 Do not switch and update the work tree after creating a new branch.
1175 .It Cm tag Oo Fl c Ar commit Oc Oo Fl m Ar message Oc Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl s Ar signer-id Oc Oo Fl v Oc Oo Fl V Oc Ar name
1176 Manage tags in a repository.
1178 Tags are managed via references which live in the
1180 reference namespace.
1183 command operates on references in this namespace only.
1184 References in this namespace point at tag objects which contain a pointer
1185 to another object, a tag message, as well as author and timestamp information.
1187 Attempt to create a tag with the given
1189 and make this tag point at the given
1191 If no commit is specified, default to the latest commit on the work tree's
1192 current branch if invoked in a work tree, and to a commit resolved via
1193 the repository's HEAD reference otherwise.
1200 Make the newly created tag reference point at the specified
1204 argument is a commit ID SHA1 hash or an existing reference or tag name which
1205 will be resolved to a commit ID.
1206 An abbreviated hash argument will be expanded to a full SHA1 hash
1207 automatically, provided the abbreviation is unique.
1209 Use the specified tag message when creating the new tag.
1214 opens a temporary file in an editor where a tag message can be written.
1215 .It Fl r Ar repository-path
1216 Use the repository at the specified path.
1217 If not specified, assume the repository is located at or above the current
1219 If this directory is a
1221 work tree, use the repository path associated with this work tree.
1223 List all existing tags in the repository instead of creating a new tag.
1226 argument is passed, show only the tag with the given
1228 .It Fl s Ar signer-id
1229 While creating a new tag, sign this tag with the identity given in
1232 For SSH-based signatures,
1234 is the path to a file which may refer to either a private SSH key,
1235 or a public SSH key with the private half available via
1238 will sign the tag object by invoking
1242 command, using the signature namespace
1244 for compatibility with
1248 During SSH signature creation and verification this option will be passed to
1250 Multiple -v options increase the verbosity.
1253 Verify tag object signatures.
1256 is specified, show and verify the tag object with the provided name.
1257 Otherwise, list all tag objects and verify signatures where present.
1260 verifies SSH-based signatures by invoking
1263 .Fl Y Ar verify Fl f Ar allowed_signers .
1268 otherwise verification is impossible.
1273 command will not delete tags or change existing tags.
1274 If a tag must be deleted, the
1276 command may be used to delete a tag's reference.
1277 This should only be done if the tag has not already been copied to
1279 .It Cm add Oo Fl R Oc Oo Fl I Oc Ar path ...
1280 Schedule unversioned files in a work tree for addition to the
1281 repository in the next commit.
1282 By default, files which match a
1284 ignore pattern will not be added.
1291 Permit recursion into directories.
1292 If this option is not specified,
1294 will refuse to run if a specified
1298 Add files even if they match a
1303 .It Cm remove Oo Fl f Oc Oo Fl k Oc Oo Fl R Oc Oo Fl s Ar status-codes Oc Ar path ...
1305 Remove versioned files from a work tree and schedule them for deletion
1306 from the repository in the next commit.
1313 Perform the operation even if a file contains local modifications,
1314 and do not raise an error if a specified
1316 does not exist on disk.
1318 Keep affected files on disk.
1320 Permit recursion into directories.
1321 If this option is not specified,
1323 will refuse to run if a specified
1326 .It Fl s Ar status-codes
1327 Only delete files with a modification status matching one of the
1328 single-character status codes contained in the
1331 The following status codes may be specified:
1332 .Bl -column YXZ description
1333 .It M Ta modified file (this implies the
1336 .It ! Ta versioned file expected on disk but missing
1340 .It Cm patch Oo Fl c Ar commit Oc Oo Fl n Oc Oo Fl p Ar strip-count Oc Oo Fl R Oc Op Ar patchfile
1344 to files in a work tree.
1345 Files added or removed by a patch will be scheduled for addition or removal in
1348 The patch must be in the unified diff format as produced by
1355 diff when invoked with their
1360 argument is provided, read unified diff data from standard input instead.
1364 contains multiple patches, then attempt to apply each of them in sequence.
1366 Show the status of each affected file, using the following status codes:
1367 .Bl -column XYZ description
1368 .It M Ta file was modified
1369 .It G Ta file was merged using a merge-base found in the repository
1370 .It C Ta file was merged and conflicts occurred during merge
1371 .It D Ta file was deleted
1372 .It A Ta file was added
1373 .It # Ta failed to patch the file
1376 If a change does not match at its exact line number, attempt to
1377 apply it somewhere else in the file if a good spot can be found.
1378 Otherwise, the patch will fail to apply.
1382 will refuse to apply a patch if certain preconditions are not met.
1383 Files to be deleted must already be under version control, and must
1384 not have been scheduled for deletion already.
1385 Files to be added must not yet be under version control and must not
1386 already be present on disk.
1387 Files to be modified must already be under version control and may not
1388 contain conflict markers.
1390 If an error occurs, the
1392 operation will be aborted.
1393 Any changes made to the work tree up to this point will be left behind.
1394 Such changes can be viewed with
1396 and can be reverted with
1405 Use files found in in the specified
1407 as a merge base for 3-way merges, overriding the meta-data in
1410 In case no merge-base is available for a file
1412 will attempt to apply the changes without doing a 3-way merge.
1414 Do not make any modifications to the work tree.
1415 This can be used to check whether a patch would apply without issues.
1418 contains diffs that affect the same file multiple times, the results
1419 displayed may be incorrect.
1420 .It Fl p Ar strip-count
1421 Specify the number of leading path components to strip from paths
1430 path prefixes generated by
1432 will be recognized and stripped automatically.
1434 Reverse the patch before applying it.
1437 .It Cm revert Oo Fl p Oc Oo Fl F Ar response-script Oc Oo Fl R Oc Ar path ...
1439 Revert any local changes in files at the specified paths in a work tree.
1440 File contents will be overwritten with those contained in the
1441 work tree's base commit.
1442 There is no way to bring discarded changes back after
1445 If a file was added with
1447 it will become an unversioned file again.
1448 If a file was deleted with
1450 it will be restored.
1457 Instead of reverting all changes in files, interactively select or reject
1458 changes to revert based on
1464 (quit reverting this file) responses.
1465 If a file is in modified status, individual patches derived from the
1466 modified file content can be reverted.
1467 Files in added or deleted status may only be reverted in their entirety.
1468 .It Fl F Ar response-script
1476 responses line-by-line from the specified
1478 file instead of prompting interactively.
1480 Permit recursion into directories.
1481 If this option is not specified,
1483 will refuse to run if a specified
1488 .It Cm commit Oo Fl A Ar author Oc Oo Fl F Ar path Oc Oo Fl m Ar message Oc Oo Fl N Oc Oo Fl S Oc Op Ar path ...
1490 Create a new commit in the repository from changes in a work tree
1491 and use this commit as the new base commit for the work tree.
1494 is specified, commit all changes in the work tree.
1495 Otherwise, commit changes at or within the specified paths.
1497 If changes have been explicitly staged for commit with
1499 only commit staged changes and reject any specified paths which
1500 have not been staged.
1503 opens a temporary file in an editor where a log message can be written
1511 options are used together.
1513 Show the status of each affected file, using the following status codes:
1514 .Bl -column YXZ description
1515 .It M Ta modified file
1516 .It D Ta file was deleted
1517 .It A Ta new file was added
1518 .It m Ta modified file modes (executable bit only)
1521 Files which are not part of the new commit will retain their previously
1522 recorded base commit.
1525 commands may refuse to run while the work tree contains files from
1526 multiple base commits.
1527 The base commit of such a work tree can be made consistent by running
1529 across the entire work tree.
1533 command requires the
1535 environment variable to be set,
1536 unless an author has been configured in
1542 configuration settings can be
1543 obtained from the repository's
1545 file or from Git's global
1554 Set author information in the newly created commit to
1556 This is useful when committing changes which were written by someone
1560 argument must use the same format as the
1562 environment variable.
1564 In addition to storing author information, the newly created commit
1567 information which is obtained, as usual, from the
1569 environment variable, or
1571 or Git configuration settings.
1573 Use the prepared log message stored in the file found at
1575 when creating the new commit.
1577 opens a temporary file in an editor where the prepared log message can be
1578 reviewed and edited further if needed.
1579 Cannot be used together with the
1583 Use the specified log message when creating the new commit.
1584 Cannot be used together with the
1588 This option prevents
1590 from opening the commit message in an editor.
1591 It has no effect unless it is used together with the
1593 option and is intended for non-interactive use such as scripting.
1595 Allow the addition of symbolic links which point outside of the path space
1596 that is under version control.
1599 will reject such symbolic links due to safety concerns.
1602 may decide to represent such a symbolic link as a regular file which contains
1603 the link's target path, rather than creating an actual symbolic link which
1604 points outside of the work tree.
1605 Use of this option is discouraged because external mechanisms such as
1607 are better suited for managing symbolic links to paths not under
1612 will refuse to run if certain preconditions are not met.
1613 If the work tree's current branch is not in the
1615 reference namespace, new commits may not be created on this branch.
1616 Local changes may only be committed if they are based on file content
1617 found in the most recent commit on the work tree's branch.
1618 If a path is found to be out of date,
1620 must be used first in order to merge local changes with changes made
1623 .It Cm send Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl d Ar branch Oc Oo Fl f Oc Oo Fl r Ar repository-path Oc Oo Fl t Ar tag Oc Oo Fl T Oc Oo Fl q Oc Oo Fl v Oc Op Ar remote-repository
1625 Send new changes to a remote repository.
1627 .Ar remote-repository
1631 The remote repository's URL is obtained from the corresponding entry in
1635 file of the local repository, as created by
1638 All objects corresponding to new changes will be written to a temporary
1639 pack file which is then uploaded to the server.
1640 Upon success, references in the
1642 reference namespace of the local repository will be updated to point at
1643 the commits which have been sent.
1645 By default, changes will only be sent if they are based on up-to-date
1646 copies of relevant branches in the remote repository.
1647 If any changes to be sent are based on out-of-date copies or would
1648 otherwise break linear history of existing branches, new changes must
1649 be fetched from the server with
1651 and local branches must be rebased with
1658 option can be used to make exceptions to these requirements.
1665 Send all branches from the local repository's
1667 reference namespace.
1670 option is equivalent to listing all branches with multiple
1673 Cannot be used together with the
1679 from the local repository's
1681 reference namespace.
1682 This option may be specified multiple times to build a list of branches
1684 If this option is not specified, default to the work tree's current branch
1685 if invoked in a work tree, or to the repository's HEAD reference.
1686 Cannot be used together with the
1690 Delete the specified
1692 from the remote repository's
1694 reference namespace.
1695 This option may be specified multiple times to build a list of branches
1698 Only references are deleted.
1699 Any commit, tree, tag, and blob objects belonging to deleted branches
1700 may become subject to deletion by Git's garbage collector running on
1703 Requesting deletion of branches results in an error if the server
1704 does not support this feature or disallows the deletion of branches
1705 based on its configuration.
1707 Attempt to force the server to overwrite existing branches or tags
1708 in the remote repository, even when
1712 would usually be required before changes can be sent.
1713 The server may reject forced requests regardless, depending on its
1716 Any commit, tree, tag, and blob objects belonging to overwritten branches
1717 or tags may become subject to deletion by Git's garbage collector running
1722 reference namespace is globally shared between all repositories.
1725 option to overwrite tags is discouraged because it can lead to
1726 inconsistencies between the tags present in different repositories.
1727 In general, creating a new tag with a different name is recommended
1728 instead of overwriting an existing tag.
1732 option is particularly discouraged if changes being sent are based
1733 on an out-of-date copy of a branch in the remote repository.
1734 Instead of using the
1736 option, new changes should
1739 and local branches should be rebased with
1741 followed by another attempt to send the changes.
1745 option should only be needed in situations where the remote repository's
1746 copy of a branch or tag is known to be out-of-date and is considered
1748 The risks of creating inconsistencies between different repositories
1749 should also be taken into account.
1750 .It Fl r Ar repository-path
1751 Use the repository at the specified path.
1752 If not specified, assume the repository is located at or above the current
1754 If this directory is a
1756 work tree, use the repository path associated with this work tree.
1760 from the local repository's
1762 reference namespace, in addition to any branches that are being sent.
1765 option may be specified multiple times to build a list of tags to send.
1766 No tags will be sent if the
1770 Raise an error if the specified
1772 already exists in the remote repository, unless the
1774 option is used to overwrite the server's copy of the tag.
1775 In general, creating a new tag with a different name is recommended
1776 instead of overwriting an existing tag.
1778 Cannot be used together with the
1782 Attempt to send all tags from the local repository's
1784 reference namespace.
1787 option is equivalent to listing all tags with multiple
1790 Cannot be used together with the
1794 Suppress progress reporting output.
1795 The same option will be passed to
1802 to print debugging messages to standard error output.
1803 The same option will be passed to
1806 Multiple -v options increase the verbosity.
1810 .It Cm cherrypick Ar commit
1812 Merge changes from a single
1817 should be on a different branch than the work tree's base commit.
1818 The expected argument is a reference or a commit ID SHA1 hash.
1819 An abbreviated hash argument will be expanded to a full SHA1 hash
1820 automatically, provided the abbreviation is unique.
1822 Show the status of each affected file, using the following status codes:
1823 .Bl -column YXZ description
1824 .It G Ta file was merged
1825 .It C Ta file was merged and conflicts occurred during merge
1826 .It ! Ta changes destined for a missing file were not merged
1827 .It D Ta file was deleted
1828 .It d Ta file's deletion was prevented by local modifications
1829 .It A Ta new file was added
1830 .It \(a~ Ta changes destined for a non-regular file were not merged
1831 .It ? Ta changes destined for an unversioned file were not merged
1834 The merged changes will appear as local changes in the work tree, which
1837 amended manually or with further
1842 or discarded again with
1846 will refuse to run if certain preconditions are not met.
1847 If the work tree contains multiple base commits, it must first be updated
1848 to a single base commit with
1850 If any relevant files already contain merge conflicts, these
1851 conflicts must be resolved first.
1853 .It Cm backout Ar commit
1855 Reverse-merge changes from a single
1860 should be on the same branch as the work tree's base commit.
1861 The expected argument is a reference or a commit ID SHA1 hash.
1862 An abbreviated hash argument will be expanded to a full SHA1 hash
1863 automatically, provided the abbreviation is unique.
1865 Show the status of each affected file, using the following status codes:
1866 .Bl -column YXZ description
1867 .It G Ta file was merged
1868 .It C Ta file was merged and conflicts occurred during merge
1869 .It ! Ta changes destined for a missing file were not merged
1870 .It D Ta file was deleted
1871 .It d Ta file's deletion was prevented by local modifications
1872 .It A Ta new file was added
1873 .It \(a~ Ta changes destined for a non-regular file were not merged
1874 .It ? Ta changes destined for an unversioned file were not merged
1877 The reverse-merged changes will appear as local changes in the work tree,
1878 which may be viewed with
1880 amended manually or with further
1885 or discarded again with
1889 will refuse to run if certain preconditions are not met.
1890 If the work tree contains multiple base commits, it must first be updated
1891 to a single base commit with
1893 If any relevant files already contain merge conflicts, these
1894 conflicts must be resolved first.
1896 .It Cm rebase Oo Fl a Oc Oo Fl c Oc Oo Fl l Oc Oo Fl X Oc Op Ar branch
1898 Rebase commits on the specified
1900 onto the tip of the current branch of the work tree.
1903 must share common ancestry with the work tree's current branch.
1904 Rebasing begins with the first descendant commit of the youngest
1905 common ancestor commit shared by the specified
1907 and the work tree's current branch, and stops once the tip commit
1914 is used as intended, the specified
1916 represents a local commit history and may already contain changes
1917 that are not yet visible in any other repositories.
1918 The work tree's current branch, which must be set with
1922 operation, represents a branch from a remote repository which shares
1923 a common history with the specified
1925 but has progressed, and perhaps diverged, due to commits added to the
1928 Rebased commits are accumulated on a temporary branch which the work tree
1929 will remain switched to throughout the entire rebase operation.
1930 Commits on this branch represent the same changes with the same log
1931 messages as their counterparts on the original
1933 but with different commit IDs.
1934 Once rebasing has completed successfully, the temporary branch becomes
1935 the new version of the specified
1937 and the work tree is automatically switched to it.
1938 If author information is available via the
1940 environment variable,
1946 configuration settings, this author information will be used to identify
1951 Old commits in their pre-rebase state are automatically backed up in the
1952 .Dq refs/got/backup/rebase
1953 reference namespace.
1954 As long as these references are not removed older versions of rebased
1955 commits will remain in the repository and can be viewed with the
1958 Removal of these references makes objects which become unreachable via
1959 any reference subject to removal by Git's garbage collector or
1960 .Cm gotadmin cleanup .
1962 While rebasing commits, show the status of each affected file,
1963 using the following status codes:
1964 .Bl -column YXZ description
1965 .It G Ta file was merged
1966 .It C Ta file was merged and conflicts occurred during merge
1967 .It ! Ta changes destined for a missing file were not merged
1968 .It D Ta file was deleted
1969 .It d Ta file's deletion was prevented by local modifications
1970 .It A Ta new file was added
1971 .It \(a~ Ta changes destined for a non-regular file were not merged
1972 .It ? Ta changes destined for an unversioned file were not merged
1975 If merge conflicts occur, the rebase operation is interrupted and may
1976 be continued once conflicts have been resolved.
1977 If any files with destined changes are found to be missing or unversioned,
1978 or if files could not be deleted due to differences in deleted content,
1979 the rebase operation will be interrupted to prevent potentially incomplete
1980 changes from being committed to the repository without user intervention.
1981 The work tree may be modified as desired and the rebase operation can be
1982 continued once the changes present in the work tree are considered complete.
1983 Alternatively, the rebase operation may be aborted which will leave
1985 unmodified and the work tree switched back to its original branch.
1987 If a merge conflict is resolved in a way which renders the merged
1988 change into a no-op change, the corresponding commit will be elided
1989 when the rebase operation continues.
1992 will refuse to run if certain preconditions are not met.
1993 If the work tree is not yet fully updated to the tip commit of its
1994 branch, then the work tree must first be updated with
1996 If changes have been staged with
1998 these changes must first be committed with
2002 If the work tree contains local changes, these changes must first be
2009 contains changes to files outside of the work tree's path prefix,
2010 the work tree cannot be used to rebase this branch.
2016 commands will refuse to run while a rebase operation is in progress.
2017 Other commands which manipulate the work tree may be used for
2018 conflict resolution purposes.
2022 is already based on the work tree's current branch, then no commits
2023 need to be rebased and
2025 will simply switch the work tree to the specified
2027 and update files in the work tree accordingly.
2034 Abort an interrupted rebase operation.
2035 If this option is used, no other command-line arguments are allowed.
2037 Continue an interrupted rebase operation.
2038 If this option is used, no other command-line arguments are allowed.
2040 Show a list of past rebase operations, represented by references in the
2041 .Dq refs/got/backup/rebase
2042 reference namespace.
2044 Display the author, date, and log message of each backed up commit,
2045 the object ID of the corresponding post-rebase commit, and
2046 the object ID of their common ancestor commit.
2047 Given these object IDs,
2054 options can be used to examine the history of either version of the branch,
2059 option can be used to create a new branch from a pre-rebase state if desired.
2063 is specified, only show commits which at some point in time represented this
2065 Otherwise, list all backed up commits for any branches.
2067 If this option is used,
2069 does not require a work tree.
2070 None of the other options can be used together with
2073 Delete backups created by past rebase operations, represented by references
2075 .Dq refs/got/backup/rebase
2076 reference namespace.
2080 is specified, only delete backups which at some point in time represented
2082 Otherwise, delete all references found within
2083 .Dq refs/got/backup/rebase .
2085 Any commit, tree, tag, and blob objects belonging to deleted backups
2086 remain in the repository and may be removed separately with
2087 Git's garbage collector or
2088 .Cm gotadmin cleanup .
2090 If this option is used,
2092 does not require a work tree.
2093 None of the other options can be used together with
2097 .It Cm histedit Oo Fl a Oc Oo Fl c Oc Oo Fl e Oc Oo Fl f Oc Oo Fl F Ar histedit-script Oc Oo Fl m Oc Oo Fl l Oc Oo Fl X Oc Op Ar branch
2099 Edit commit history between the work tree's current base commit and
2100 the tip commit of the work tree's current branch.
2104 command requires the
2106 environment variable to be set,
2107 unless an author has been configured in
2113 configuration settings can be obtained from the repository's
2115 file or from Git's global
2121 operation, the work tree's current branch must be set with
2123 to the branch which should be edited, unless this branch is already the
2124 current branch of the work tree.
2125 The tip of this branch represents the upper bound (inclusive) of commits
2130 Furthermore, the work tree's base commit
2133 to a point in this branch's commit history where editing should begin.
2134 This commit represents the lower bound (non-inclusive) of commits touched
2139 Editing of commit history is controlled via a
2141 which can be written in an editor based on a template, passed on the
2142 command line, or generated with the
2148 The format of the histedit script is line-based.
2149 Each line in the script begins with a command name, followed by
2150 whitespace and an argument.
2151 For most commands, the expected argument is a commit ID SHA1 hash.
2152 Any remaining text on the line is ignored.
2153 Lines which begin with the
2155 character are ignored entirely.
2157 The available histedit script commands are as follows:
2158 .Bl -column YXZ pick-commit
2159 .It Cm pick Ar commit Ta Use the specified commit as it is.
2160 .It Cm edit Ar commit Ta Use the specified commit but once changes have been
2161 merged into the work tree interrupt the histedit operation for amending.
2162 .It Cm fold Ar commit Ta Combine the specified commit with the next commit
2163 listed further below that will be used.
2164 .It Cm drop Ar commit Ta Remove this commit from the edited history.
2165 .It Cm mesg Oo Ar log-message Oc Ta Create a new log message for the commit of
2170 command on the previous line of the histedit script.
2173 argument provides a new single-line log message to use.
2176 argument is omitted, open an editor where a new log message can be written.
2179 Every commit in the history being edited must be mentioned in the script.
2180 Lines may be re-ordered to change the order of commits in the edited history.
2181 No commit may be listed more than once.
2183 Edited commits are accumulated on a temporary branch which the work tree
2184 will remain switched to throughout the entire histedit operation.
2185 Once history editing has completed successfully, the temporary branch becomes
2186 the new version of the work tree's branch and the work tree is automatically
2189 Old commits in their pre-histedit state are automatically backed up in the
2190 .Dq refs/got/backup/histedit
2191 reference namespace.
2192 As long as these references are not removed older versions of edited
2193 commits will remain in the repository and can be viewed with the
2196 Removal of these references makes objects which become unreachable via
2197 any reference subject to removal by Git's garbage collector or
2198 .Cm gotadmin cleanup .
2200 While merging commits, show the status of each affected file,
2201 using the following status codes:
2202 .Bl -column YXZ description
2203 .It G Ta file was merged
2204 .It C Ta file was merged and conflicts occurred during merge
2205 .It ! Ta changes destined for a missing file were not merged
2206 .It D Ta file was deleted
2207 .It d Ta file's deletion was prevented by local modifications
2208 .It A Ta new file was added
2209 .It \(a~ Ta changes destined for a non-regular file were not merged
2210 .It ? Ta changes destined for an unversioned file were not merged
2213 If merge conflicts occur, the histedit operation is interrupted and may
2214 be continued once conflicts have been resolved.
2215 If any files with destined changes are found to be missing or unversioned,
2216 or if files could not be deleted due to differences in deleted content,
2217 the histedit operation will be interrupted to prevent potentially incomplete
2218 changes from being committed to the repository without user intervention.
2219 The work tree may be modified as desired and the histedit operation can be
2220 continued once the changes present in the work tree are considered complete.
2221 Alternatively, the histedit operation may be aborted which will leave
2222 the work tree switched back to its original branch.
2224 If a merge conflict is resolved in a way which renders the merged
2225 change into a no-op change, the corresponding commit will be elided
2226 when the histedit operation continues.
2229 will refuse to run if certain preconditions are not met.
2230 If the work tree's current branch is not in the
2232 reference namespace, the history of the branch may not be edited.
2233 If the work tree contains multiple base commits, it must first be updated
2234 to a single base commit with
2236 If changes have been staged with
2238 these changes must first be committed with
2242 If the work tree contains local changes, these changes must first be
2247 If the edited history contains changes to files outside of the work tree's
2248 path prefix, the work tree cannot be used to edit the history of this branch.
2255 commands will refuse to run while a histedit operation is in progress.
2256 Other commands which manipulate the work tree may be used, and the
2258 command may be used to commit arbitrary changes to the temporary branch
2259 while the histedit operation is interrupted.
2266 Abort an interrupted histedit operation.
2267 If this option is used, no other command-line arguments are allowed.
2269 Continue an interrupted histedit operation.
2270 If this option is used, no other command-line arguments are allowed.
2272 Interrupt the histedit operation for editing after merging each commit.
2273 This option is a quick equivalent to a histedit script which uses the
2275 command for all commits.
2278 option can only be used when starting a new histedit operation.
2279 If this option is used, no other command-line arguments are allowed.
2281 Fold all commits into a single commit.
2282 This option is a quick equivalent to a histedit script which folds all
2283 commits, combining them all into one commit.
2286 option can only be used when starting a new histedit operation.
2287 If this option is used, no other command-line arguments are allowed.
2288 .It Fl F Ar histedit-script
2291 instead of opening a temporary file in an editor where a histedit script
2294 Edit log messages only.
2295 This option is a quick equivalent to a histedit script which edits
2296 only log messages but otherwise leaves every picked commit as-is.
2299 option can only be used when starting a new histedit operation.
2300 If this option is used, no other command-line arguments are allowed.
2302 Show a list of past histedit operations, represented by references in the
2303 .Dq refs/got/backup/histedit
2304 reference namespace.
2306 Display the author, date, and log message of each backed up commit,
2307 the object ID of the corresponding post-histedit commit, and
2308 the object ID of their common ancestor commit.
2309 Given these object IDs,
2316 options can be used to examine the history of either version of the branch,
2321 option can be used to create a new branch from a pre-histedit state if desired.
2325 is specified, only show commits which at some point in time represented this
2327 Otherwise, list all backed up commits for any branches.
2329 If this option is used,
2331 does not require a work tree.
2332 None of the other options can be used together with
2335 Delete backups created by past histedit operations, represented by references
2337 .Dq refs/got/backup/histedit
2338 reference namespace.
2342 is specified, only delete backups which at some point in time represented
2344 Otherwise, delete all references found within
2345 .Dq refs/got/backup/histedit .
2347 Any commit, tree, tag, and blob objects belonging to deleted backups
2348 remain in the repository and may be removed separately with
2349 Git's garbage collector or
2350 .Cm gotadmin cleanup .
2352 If this option is used,
2354 does not require a work tree.
2355 None of the other options can be used together with
2359 .It Cm integrate Ar branch
2361 Integrate the specified
2363 into the work tree's current branch.
2364 Files in the work tree are updated to match the contents on the integrated
2366 and the reference of the work tree's branch is changed to point at the
2367 head commit of the integrated
2370 Both branches can be considered equivalent after integration since they
2371 will be pointing at the same commit.
2372 Both branches remain available for future work, if desired.
2373 In case the integrated
2375 is no longer needed it may be deleted with
2378 Show the status of each affected file, using the following status codes:
2379 .Bl -column YXZ description
2380 .It U Ta file was updated
2381 .It D Ta file was deleted
2382 .It A Ta new file was added
2383 .It \(a~ Ta versioned file is obstructed by a non-regular file
2384 .It ! Ta a missing versioned file was restored
2388 will refuse to run if certain preconditions are not met.
2389 Most importantly, the
2391 must have been rebased onto the work tree's current branch with
2393 before it can be integrated, in order to linearize commit history and
2394 resolve merge conflicts.
2395 If the work tree contains multiple base commits, it must first be updated
2396 to a single base commit with
2398 If changes have been staged with
2400 these changes must first be committed with
2404 If the work tree contains local changes, these changes must first be
2410 .It Cm merge Oo Fl a Oc Oo Fl c Oc Oo Fl n Oc Op Ar branch
2412 Create a merge commit based on the current branch of the work tree and
2415 If a linear project history is desired, then use of
2417 should be preferred over
2419 However, even strictly linear projects may require merge commits in order
2420 to merge in new versions of third-party code stored on vendor branches
2424 Merge commits are commits based on multiple parent commits.
2425 The tip commit of the work tree's current branch, which must be set with
2429 operation, will be used as the first parent.
2430 The tip commit of the specified
2432 will be used as the second parent.
2434 No ancestral relationship between the two branches is required.
2435 If the two branches have already been merged previously, only new changes
2438 It is not possible to create merge commits with more than two parents.
2439 If more than one branch needs to be merged, then multiple merge commits
2440 with two parents each can be created in sequence.
2442 While merging changes found on the
2444 into the work tree, show the status of each affected file,
2445 using the following status codes:
2446 .Bl -column YXZ description
2447 .It G Ta file was merged
2448 .It C Ta file was merged and conflicts occurred during merge
2449 .It ! Ta changes destined for a missing file were not merged
2450 .It D Ta file was deleted
2451 .It d Ta file's deletion was prevented by local modifications
2452 .It A Ta new file was added
2453 .It \(a~ Ta changes destined for a non-regular file were not merged
2454 .It ? Ta changes destined for an unversioned file were not merged
2457 If merge conflicts occur, the merge operation is interrupted and conflicts
2458 must be resolved before the merge operation can continue.
2459 If any files with destined changes are found to be missing or unversioned,
2460 or if files could not be deleted due to differences in deleted content,
2461 the merge operation will be interrupted to prevent potentially incomplete
2462 changes from being committed to the repository without user intervention.
2463 The work tree may be modified as desired and the merge can be continued
2464 once the changes present in the work tree are considered complete.
2465 Alternatively, the merge operation may be aborted which will leave
2466 the work tree's current branch unmodified.
2468 If a merge conflict is resolved in a way which renders all merged
2469 changes into no-op changes, the merge operation cannot continue
2470 and must be aborted.
2473 will refuse to run if certain preconditions are not met.
2476 is based on the work tree's current branch, then no merge commit can
2479 may be used to integrate the
2482 If the work tree is not yet fully updated to the tip commit of its
2483 branch, then the work tree must first be updated with
2485 If the work tree contains multiple base commits, it must first be updated
2486 to a single base commit with
2488 If changes have been staged with
2490 these changes must first be committed with
2494 If the work tree contains local changes, these changes must first be
2501 contains changes to files outside of the work tree's path prefix,
2502 the work tree cannot be used to merge this branch.
2512 commands will refuse to run while a merge operation is in progress.
2513 Other commands which manipulate the work tree may be used for
2514 conflict resolution purposes.
2521 Abort an interrupted merge operation.
2522 If this option is used, no other command-line arguments are allowed.
2524 Continue an interrupted merge operation.
2525 If this option is used, no other command-line arguments are allowed.
2527 Merge changes into the work tree as usual but do not create a merge
2529 The merge result can be adjusted as desired before a merge commit is
2532 Alternatively, the merge may be aborted with
2536 .It Cm stage Oo Fl l Oc Oo Fl p Oc Oo Fl F Ar response-script Oc Oo Fl S Oc Op Ar path ...
2538 Stage local changes for inclusion in the next commit.
2541 is specified, stage all changes in the work tree.
2542 Otherwise, stage changes at or within the specified paths.
2543 Paths may be staged if they are added, modified, or deleted according to
2546 Show the status of each affected file, using the following status codes:
2547 .Bl -column YXZ description
2548 .It A Ta file addition has been staged
2549 .It M Ta file modification has been staged
2550 .It D Ta file deletion has been staged
2553 Staged file contents are saved in newly created blob objects in the repository.
2554 These blobs will be referred to by tree objects once staged changes have been
2557 Staged changes affect the behaviour of
2562 While paths with staged changes exist, the
2564 command will refuse to commit any paths which do not have staged changes.
2565 Local changes created on top of staged changes can only be committed if
2566 the path is staged again, or if the staged changes are committed first.
2569 command will show both local changes and staged changes.
2572 command is able to display local changes relative to staged changes,
2573 and to display staged changes relative to the repository.
2576 command cannot revert staged changes but may be used to revert
2577 local changes created on top of staged changes.
2584 Instead of staging new changes, list paths which are already staged,
2585 along with the IDs of staged blob objects and stage status codes.
2586 If paths were provided on the command line, show the staged paths
2587 among the specified paths.
2588 Otherwise, show all staged paths.
2590 Instead of staging the entire content of a changed file, interactively
2591 select or reject changes for staging based on
2595 (reject change), and
2597 (quit staging this file) responses.
2598 If a file is in modified status, individual patches derived from the
2599 modified file content can be staged.
2600 Files in added or deleted status may only be staged or rejected in
2602 .It Fl F Ar response-script
2610 responses line-by-line from the specified
2612 file instead of prompting interactively.
2614 Allow staging of symbolic links which point outside of the path space
2615 that is under version control.
2618 will reject such symbolic links due to safety concerns.
2621 may decide to represent such a symbolic link as a regular file which contains
2622 the link's target path, rather than creating an actual symbolic link which
2623 points outside of the work tree.
2624 Use of this option is discouraged because external mechanisms such as
2626 are better suited for managing symbolic links to paths not under
2631 will refuse to run if certain preconditions are not met.
2632 If a file contains merge conflicts, these conflicts must be resolved first.
2633 If a file is found to be out of date relative to the head commit on the
2634 work tree's current branch, the file must be updated with
2636 before it can be staged (however, this does not prevent the file from
2637 becoming out-of-date at some point after having been staged).
2644 commands will refuse to run while staged changes exist.
2645 If staged changes cannot be committed because a staged path
2646 is out of date, the path must be unstaged with
2648 before it can be updated with
2650 and may then be staged again if necessary.
2652 .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ...
2654 Merge staged changes back into the work tree and put affected paths
2655 back into non-staged status.
2658 is specified, unstage all staged changes across the entire work tree.
2659 Otherwise, unstage changes at or within the specified paths.
2661 Show the status of each affected file, using the following status codes:
2662 .Bl -column YXZ description
2663 .It G Ta file was unstaged
2664 .It C Ta file was unstaged and conflicts occurred during merge
2665 .It ! Ta changes destined for a missing file were not merged
2666 .It D Ta file was staged as deleted and still is deleted
2667 .It d Ta file's deletion was prevented by local modifications
2668 .It \(a~ Ta changes destined for a non-regular file were not merged
2676 Instead of unstaging the entire content of a changed file, interactively
2677 select or reject changes for unstaging based on
2681 (keep change staged), and
2683 (quit unstaging this file) responses.
2684 If a file is staged in modified status, individual patches derived from the
2685 staged file content can be unstaged.
2686 Files staged in added or deleted status may only be unstaged in their entirety.
2687 .It Fl F Ar response-script
2695 responses line-by-line from the specified
2697 file instead of prompting interactively.
2699 .It Cm cat Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl P Oc Ar arg ...
2700 Parse and print contents of objects to standard output in a line-based
2702 Content of commit, tree, and tag objects is printed in a way similar
2703 to the actual content stored in such objects.
2704 Blob object contents are printed as they would appear in files on disk.
2706 Attempt to interpret each argument as a reference, a tag name, or
2707 an object ID SHA1 hash.
2708 References will be resolved to an object ID.
2709 Tag names will resolved to a tag object.
2710 An abbreviated hash argument will be expanded to a full SHA1 hash
2711 automatically, provided the abbreviation is unique.
2713 If none of the above interpretations produce a valid result, or if the
2715 option is used, attempt to interpret the argument as a path which will
2716 be resolved to the ID of an object found at this path in the repository.
2723 Look up paths in the specified
2725 If this option is not used, paths are looked up in the commit resolved
2726 via the repository's HEAD reference.
2727 The expected argument is a commit ID SHA1 hash or an existing reference
2728 or tag name which will be resolved to a commit ID.
2729 An abbreviated hash argument will be expanded to a full SHA1 hash
2730 automatically, provided the abbreviation is unique.
2731 .It Fl r Ar repository-path
2732 Use the repository at the specified path.
2733 If not specified, assume the repository is located at or above the current
2735 If this directory is a
2737 work tree, use the repository path associated with this work tree.
2739 Interpret all arguments as paths only.
2740 This option can be used to resolve ambiguity in cases where paths
2741 look like tag names, reference names, or object IDs.
2743 .It Cm info Op Ar path ...
2744 Display meta-data stored in a work tree.
2749 The work tree to use is resolved implicitly by walking upwards from the
2750 current working directory.
2754 arguments are specified, show additional per-file information for tracked
2755 files located at or within these paths.
2758 argument corresponds to the work tree's root directory, display information
2759 for all tracked files.
2762 .Bl -tag -width GOT_IGNORE_GITCONFIG
2764 The author's name and email address, such as
2765 .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
2775 may fail to parse commits without an email address in author data,
2779 environment variables with a missing email address.
2781 .Ev GOT_AUTHOR will be overridden by configuration settings in
2787 configuration settings in the repository's
2794 configuration settings contained in Git's global
2796 configuration file will only be used if neither
2800 environment variable provide author information.
2801 .It Ev VISUAL , EDITOR
2802 The editor spawned by
2810 text editor will be spawned in order to give
2812 the attention it deserves.
2813 .It Ev GOT_LOG_DEFAULT_LIMIT
2814 The default limit on the number of commits traversed by
2816 If set to zero, the limit is unbounded.
2817 This variable will be silently ignored if it is set to a non-numeric value.
2818 .It Ev GOT_IGNORE_GITCONFIG
2819 If this variable is set then any remote repository definitions or author
2820 information found in Git configuration files will be ignored.
2823 .Bl -tag -width packed-refs -compact
2825 Repository-wide configuration settings for
2829 configuration file located in the root directory of a Git repository
2830 supersedes any relevant settings in Git's
2834 .It Pa .got/got.conf
2835 Worktree-specific configuration settings for
2839 configuration file in the
2841 meta-data directory of a work tree supersedes any relevant settings in
2844 configuration file and Git's
2851 Enable tab-completion of
2856 .Dl $ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
2858 Clone an existing Git repository for use with
2862 .Dl $ got clone ssh://git@github.com/openbsd/src.git
2864 Use of HTTP URLs currently requires
2868 .Dl $ git clone --bare https://github.com/openbsd/src.git
2870 Alternatively, for quick and dirty local testing of
2872 a new Git repository could be created and populated with files,
2873 e.g. from a temporary CVS checkout located at
2876 .Dl $ gotadmin init /var/git/src.git
2877 .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
2879 Check out a work tree from the Git repository to /usr/src:
2881 .Dl $ got checkout /var/git/src.git /usr/src
2883 View local changes in a work tree directory:
2885 .Dl $ got diff | less
2887 In a work tree, display files in a potentially problematic state:
2889 .Dl $ got status -s 'C!~?'
2891 Interactively revert selected local changes in a work tree directory:
2893 .Dl $ got revert -p -R\ .
2895 In a work tree or a git repository directory, list all branch references:
2899 In a work tree or a git repository directory, create a new branch called
2900 .Dq unified-buffer-cache
2901 which is forked off the
2905 .Dl $ got branch -c master unified-buffer-cache
2907 Switch an existing work tree to the branch
2908 .Dq unified-buffer-cache .
2909 Local changes in the work tree will be preserved and merged if necessary:
2911 .Dl $ got update -b unified-buffer-cache
2913 Create a new commit from local changes in a work tree directory.
2914 This new commit will become the head commit of the work tree's current branch:
2918 In a work tree or a git repository directory, view changes committed in
2919 the 3 most recent commits to the work tree's branch, or the branch resolved
2920 via the repository's HEAD reference, respectively:
2922 .Dl $ got log -p -l 3
2924 As above, but display changes in the order in which
2926 could apply them in sequence:
2928 .Dl $ got log -p -l 3 -R
2930 In a work tree or a git repository directory, log the history of a subdirectory:
2932 .Dl $ got log sys/uvm
2934 While operating inside a work tree, paths are specified relative to the current
2935 working directory, so this command will log the subdirectory
2938 .Dl $ cd sys/uvm && got log\ .
2940 And this command has the same effect:
2942 .Dl $ cd sys/dev/usb && got log ../../uvm
2944 And this command displays work tree meta-data about all tracked files:
2947 .Dl $ got info\ . | less
2949 Add new files and remove obsolete files in a work tree directory:
2951 .Dl $ got add sys/uvm/uvm_ubc.c
2952 .Dl $ got remove sys/uvm/uvm_vnode.c
2954 Create a new commit from local changes in a work tree directory
2955 with a pre-defined log message.
2957 .Dl $ got commit -m 'unify the buffer cache'
2959 Alternatively, create a new commit from local changes in a work tree
2960 directory with a log message that has been prepared in the file
2963 .Dl $ got commit -F /tmp/msg
2965 Update any work tree checked out from the
2966 .Dq unified-buffer-cache
2967 branch to the latest commit on this branch:
2971 Roll file content on the unified-buffer-cache branch back by one commit,
2972 and then fetch the rolled-back change into the work tree as a local change
2973 to be amended and perhaps committed again:
2975 .Dl $ got backout unified-buffer-cache
2976 .Dl $ got commit -m 'roll back previous'
2977 .Dl $ # now back out the previous backout :-)
2978 .Dl $ got backout unified-buffer-cache
2980 Fetch new changes on the remote repository's
2982 branch, making them visible on the local repository's
2989 In a repository created with a HTTP URL and
2990 .Cm git clone --bare
2993 command must be used instead:
2995 .Dl $ cd /var/git/src.git
2996 .Dl $ git fetch origin master:refs/remotes/origin/master
3000 branch to merge the new changes that are now visible on the
3005 .Dl $ got update -b origin/master
3006 .Dl $ got rebase master
3009 .Dq unified-buffer-cache
3010 branch on top of the new head commit of the
3014 .Dl $ got update -b master
3015 .Dl $ got rebase unified-buffer-cache
3017 Create a patch from all changes on the unified-buffer-cache branch.
3018 The patch can be mailed out for review and applied to
3022 .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
3024 Edit the entire commit history of the
3025 .Dq unified-buffer-cache
3028 .Dl $ got update -b unified-buffer-cache
3029 .Dl $ got update -c master
3032 Before working against existing branches in a repository cloned with
3033 .Cm git clone --bare
3038 must be configured to map all references in the remote repository
3041 namespace of the local repository.
3042 This can be achieved by setting Git's
3043 .Pa remote.origin.fetch
3044 configuration variable to the value
3045 .Dq +refs/heads/*:refs/remotes/origin/*
3050 .Dl $ cd /var/git/repo
3051 .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
3055 option must be disabled:
3057 .Dl $ cd /var/git/repo
3058 .Dl $ git config remote.origin.mirror false
3060 Alternatively, the following
3062 configuration item can be added manually to the Git repository's
3066 .Dl [remote \&"origin\&"]
3068 .Dl fetch = +refs/heads/*:refs/remotes/origin/*
3071 This configuration leaves the local repository's
3073 namespace free for use by local branches checked out with
3075 and, if needed, created with
3078 .Dq refs/remotes/origin
3079 namespace can now be updated with incoming changes from the remote
3084 without extra command line arguments.
3085 Newly fetched changes can be examined with
3088 Display changes on the remote repository's version of the
3090 branch, as of the last time
3094 .Dl $ got log -c origin/master | less
3096 As shown here, most commands accept abbreviated reference names such as
3099 .Dq refs/remotes/origin/master .
3100 The latter is only needed in case of ambiguity.
3103 must be used to merge changes which are visible on the
3108 This will also merge local changes, if any, with the incoming changes:
3110 .Dl $ got update -b origin/master
3111 .Dl $ got rebase master
3113 In order to make changes committed to the
3114 .Dq unified-buffer-cache
3118 .Dq unified-buffer-cache
3119 branch must first be rebased onto the
3123 .Dl $ got update -b master
3124 .Dl $ got rebase unified-buffer-cache
3127 .Dq unified-buffer-cache
3128 branch can now be made visible on the
3132 Because the rebase operation switched the work tree to the
3133 .Dq unified-buffer-cache
3134 branch, the work tree must be switched back to the
3138 .Dl $ got update -b master
3139 .Dl $ got integrate unified-buffer-cache
3143 branch, log messages for local changes can now be amended with
3145 by other developers and any other important new information:
3147 .Dl $ got update -c origin/master
3148 .Dl $ got histedit -m
3150 If the remote repository offers write access, local changes on the
3152 branch can be sent to the remote repository with
3156 can be run without further arguments.
3157 The arguments shown here match defaults, provided the work tree's
3158 current branch is the
3162 .Dl $ got send -b master origin
3164 If the remote repository requires the HTTPS protocol, the
3166 command must be used instead:
3168 .Dl $ cd /var/git/src.git
3169 .Dl $ git push origin master
3171 When making contributions to projects which use the
3173 workflow, SSH protocol repository access needs to be set up first.
3174 Once an account has been created on a Git hosting site it should
3175 be possible to upload a public SSH key for repository access
3180 workflow will usually involve two remote repositories.
3181 In the real-life example below, the
3183 repository was forked from the
3185 repository by using the Git hosting site's web interface.
3188 file in the local repository describes both remote repositories:
3189 .Bd -literal -offset indent
3190 # Jelmers's repository, which accepts pull requests
3192 server git@github.com
3194 repository "/jelmer/dulwich"
3198 # Stefan's fork, used as the default remote repository
3200 server git@github.com
3202 repository "/stspdotname/dulwich"
3207 With this configuration, Stefan can create commits on
3208 .Dq refs/heads/master
3209 and send them to the
3211 repository by running:
3213 .Dl $ got send -b master origin
3215 The changes can now be proposed to Jelmer by opening a pull request
3216 via the Git hosting site's web interface.
3217 If Jelmer requests further changes to be made, additional commits
3218 can be created on the
3220 branch and be added to the pull request by running
3224 If Jelmer prefers additional commits to be
3226 then the following commands can be used to achieve this:
3228 .Dl $ got update -b master
3229 .Dl $ got update -c origin/master
3230 .Dl $ got histedit -f
3231 .Dl $ got send -f -b master origin
3233 Once Jelmer has accepted the pull request, Stefan can fetch the
3234 merged changes, and possibly several other new changes, by running:
3236 .Dl $ got fetch upstream
3238 The merged changes will now be visible under the reference
3239 .Dq refs/remotes/upstream/master .
3242 branch can now be rebased on top of the latest changes
3245 .Dl $ got update -b upstream/master
3246 .Dl $ got rebase master
3248 As a final step, the forked repository's copy of the master branch needs
3249 to be kept in sync by sending the new changes there:
3251 .Dl $ got send -f -b master origin
3253 If multiple pull requests need to be managed in parallel, a separate branch
3254 must be created for each pull request with
3256 Each such branch can then be used as above, in place of
3257 .Dq refs/heads/master .
3258 Changes for any accepted pull requests will still appear under
3259 .Dq refs/remotes/upstream/master,
3260 regardless of which branch was used in the forked repository to
3261 create a pull request.
3265 .Xr git-repository 5 ,
3266 .Xr got-worktree 5 ,
3270 .An Anthony J. Bentley Aq Mt bentley@openbsd.org
3271 .An Christian Weisgerber Aq Mt naddy@openbsd.org
3272 .An Hiltjo Posthuma Aq Mt hiltjo@codemadness.org
3273 .An Josh Rickmar Aq Mt jrick@zettaport.com
3274 .An Joshua Stein Aq Mt jcs@openbsd.org
3275 .An Klemens Nanni Aq Mt kn@openbsd.org
3276 .An Martin Pieuchot Aq Mt mpi@openbsd.org
3277 .An Neels Hofmeyr Aq Mt neels@hofmeyr.de
3278 .An Omar Polo Aq Mt op@openbsd.org
3279 .An Ori Bernstein Aq Mt ori@openbsd.org
3280 .An Sebastien Marie Aq Mt semarie@openbsd.org
3281 .An Stefan Sperling Aq Mt stsp@openbsd.org
3282 .An Steven McDonald Aq Mt steven@steven-mcdonald.id.au
3283 .An Theo Buehler Aq Mt tb@openbsd.org
3284 .An Thomas Adam Aq Mt thomas@xteddy.org
3285 .An Tracey Emery Aq Mt tracey@traceyemery.net
3286 .An Yang Zhong Aq Mt yzhong@freebsdfoundation.org
3293 were derived from code under copyright by:
3295 .An Caldera International
3296 .An Daniel Hartmeier
3301 .An Jean-Francois Brousseau
3307 .An Niklas Hallqvist
3312 .An Xavier Santolaria
3315 contains code contributed to the public domain by
3319 is a work-in-progress and some features remain to be implemented.
3321 At present, the user has to fall back on
3323 to perform some tasks.
3327 Reading from remote repositories over HTTP or HTTPS protocols requires
3332 Writing to remote repositories over HTTP or HTTPS protocols requires
3335 The creation of merge commits with more than two parent commits requires
3338 In situations where files or directories were moved around
3340 will not automatically merge changes to new locations and
3342 will usually produce better results.
