2 .\" Copyright (c) 2017 Martin Pieuchot
3 .\" Copyright (c) 2018, 2019, 2020 Stefan Sperling
5 .\" Permission to use, copy, modify, and distribute this software for any
6 .\" purpose with or without fee is hereby granted, provided that the above
7 .\" copyright notice and this permission notice appear in all copies.
9 .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
30 is a version control system which stores the history of tracked files
31 in a Git repository, as used by the Git version control system.
32 This repository format is described in
33 .Xr git-repository 5 .
38 version control system because every copy of a repository is writeable.
39 Modifications made to files can be synchronized between repositories
44 must be checked out from the repository for modification.
45 Checked out files are stored in a
47 which can be placed at an arbitrary directory in the filesystem hierarchy.
48 The on-disk format of this work tree is described in
52 provides global and command-specific options.
53 Global options must precede the command name, and are as follows:
54 .Bl -tag -width tenletters
56 Display usage information and exit immediately.
58 Display program version and exit immediately.
64 .Bl -tag -width checkout
71 .Op Fl r Ar repository-path
75 Create an initial commit in a repository from the file hierarchy
78 The created commit will not have any parent commits, i.e. it will be a
80 Also create a new reference which provides a branch name for the newly
82 Show the path of each imported file to indicate progress.
88 environment variable to be set,
89 unless an author has been configured in
95 configuration settings can be obtained from the repository's
97 file or from Git's global
108 If this option is not specified, a branch corresponding to the repository's
109 HEAD reference will be used.
110 Use of this option is required if the branch resolved via the repository's
111 HEAD reference already exists.
113 Ignore files or directories with a name which matches the specified
115 This option may be specified multiple times to build a list of ignore patterns.
118 follows the globbing rules documented in
120 Ignore patterns which end with a slash,
122 will only match directories.
124 Use the specified log message when creating the new commit.
129 opens a temporary file in an editor where a log message can be written.
130 .It Fl r Ar repository-path
131 Use the repository at the specified path.
132 If not specified, assume the repository is located at or above the current
140 .Op Fl R Ar reference
145 Clone a Git repository at the specified
151 is specified, the directory name will be derived from the name of the
154 will refuse to run if the
160 specifies a protocol scheme, a server hostname, an optional port number
161 separated from the hostname by a colon, and a path to the repository on
163 .Lk scheme://hostname:port/path/to/repository
165 The following protocol schemes are supported:
166 .Bl -tag -width git+ssh
168 The Git protocol as implemented by the
171 Use of this protocol is discouraged since it supports neither authentication
174 The Git protocol wrapped in an authenticated and encrypted
177 With this protocol the hostname may contain an embedded username for
182 Short alias for git+ssh.
185 Objects in the cloned repository are stored in a pack file which is downloaded
187 This pack file will then be indexed to facilitate access to the objects stored
189 If any objects in the pack file are stored in deltified form, all deltas will
190 be fully resolved in order to compute the ID of such objects.
191 This can take some time.
192 More details about the pack file format are documented in
193 .Xr git-repository 5 .
196 creates a remote repository entry in the
200 files of the cloned repository to store the
206 arguments for future use by
216 Fetch all branches from the remote repository's
218 reference namespace and set
219 .Cm fetch_all_branches
220 in the cloned repository's
222 file for future use by
224 If this option is not specified, a branch resolved via the remote
225 repository's HEAD reference will be fetched.
226 Cannot be used together with the
232 from the remote repository's
235 This option may be specified multiple times to build a list of branches
237 If the branch corresponding to the remote repository's HEAD reference is not
238 in this list, the cloned repository's HEAD reference will be set to the first
239 branch which was fetched.
240 If this option is not specified, a branch resolved via the remote
241 repository's HEAD reference will be fetched.
242 Cannot be used together with the
246 List branches and tags available for fetching from the remote repository
247 and exit immediately.
248 Cannot be used together with any of the other options except
253 Create the cloned repository as a mirror of the original repository.
254 This is useful if the cloned repository will not be used to store
255 locally created commits.
261 files will be set up with the
263 option enabled, such that
267 will write incoming changes directly to branches in the
269 reference namespace, rather than to branches in the
272 This avoids the usual requirement of having to run
276 in order to make incoming changes appear on branches in the
279 But maintaining custom changes in the cloned repository becomes difficult
280 since such changes will be at risk of being discarded whenever incoming
283 Suppress progress reporting output.
284 The same option will be passed to
287 .It Fl R Ar reference
288 In addition to the branches and tags that will be fetched, fetch an arbitrary
290 from the remote repository's
293 This option may be specified multiple times to build a list of additional
297 may either be a path to a specific reference, or a reference namespace
298 which will cause all references in this namespace to be fetched.
300 Each reference will be mapped into the cloned repository's
302 namespace, unless the
304 option is used to mirror references directly into the cloned repository's
309 will refuse to fetch references from the remote repository's
318 to print debugging messages to standard error output.
319 This option will be passed to
322 Multiple -v options increase the verbosity.
330 .Op Fl R Ar reference
331 .Op Fl r Ar repository-path
332 .Op Ar remote-repository
335 Fetch new changes from a remote repository.
337 .Ar remote-repository
341 The remote repository's URL is obtained from the corresponding entry in
345 file of the local repository, as created by
348 By default, any branches configured in
351 .Ar remote-repository
355 is invoked in a work tree then this work tree's current branch will be
356 fetched, too, provided it is present on the server.
357 If no branches to fetch can be found in
359 or via a work tree, or said branches are not found on the server, a branch
360 resolved via the remote repository's HEAD reference will be fetched.
361 Likewise, if a HEAD reference for the
362 .Ar remote-repository
363 exists but its target no longer matches the remote HEAD, then
364 the new target branch will be fetched.
365 This default behaviour can be overridden with the
371 New changes will be stored in a separate pack file downloaded from the server.
372 Optionally, separate pack files stored in the repository can be combined with
375 By default, branch references in the
377 reference namespace will be updated to point at the newly fetched commits.
380 command can then be used to make new changes visible on branches in the
382 namespace, merging incoming changes with the changes on those branches
385 If the repository was created as a mirror with
387 then all branches in the
389 namespace will be updated directly to match the corresponding branches in
390 the remote repository.
391 If those branches contained local commits, these commits will no longer be
392 reachable via a reference and will therefore be at risk of being discarded
393 by Git's garbage collector or
394 .Cm gotadmin cleanup .
395 Maintaining custom changes in a mirror repository is therefore discouraged.
397 In any case, references in the
399 namespace will always be fetched and mapped directly to local references
400 in the same namespace.
407 Fetch all branches from the remote repository's
410 This option can be enabled by default for specific repositories in
412 Cannot be used together with the
418 from the remote repository's
421 This option may be specified multiple times to build a list of branches
423 Cannot be used together with the
427 Delete branches and tags from the local repository which are no longer
428 present in the remote repository.
429 Only references are deleted.
430 Any commit, tree, tag, and blob objects belonging to deleted branches or
431 tags remain in the repository and may be removed separately with
432 Git's garbage collector or
433 .Cm gotadmin cleanup .
435 List branches and tags available for fetching from the remote repository
436 and exit immediately.
437 Cannot be used together with any of the other options except
443 Suppress progress reporting output.
444 The same option will be passed to
447 .It Fl R Ar reference
448 In addition to the branches and tags that will be fetched, fetch an arbitrary
450 from the remote repository's
453 This option may be specified multiple times to build a list of additional
457 may either be a path to a specific reference, or a reference namespace
458 which will cause all references in this namespace to be fetched.
460 Each reference will be mapped into the local repository's
462 namespace, unless the local repository was created as a mirror with
464 in which case references will be mapped directly into the local repository's
468 Once a reference has been fetched, a branch based on it can be created with
473 will refuse to fetch references from the remote repository's
478 .It Fl r Ar repository-path
479 Use the repository at the specified path.
480 If not specified, assume the repository is located at or above the current
482 If this directory is a
484 work tree, use the repository path associated with this work tree.
486 Allow existing references in the
488 namespace to be updated if they have changed on the server.
489 If not specified, only new tag references will be created.
494 to print debugging messages to standard error output.
495 The same option will be passed to
498 Multiple -v options increase the verbosity.
501 Delete all references which correspond to a particular
502 .Ar remote-repository
503 instead of fetching new changes.
504 This can be useful when a remote repository is being removed from
510 .Ar remote-repository
511 argument is mandatory and no other options except
518 Only references are deleted.
519 Any commit, tree, tag, and blob objects fetched from a remote repository
520 will generally be stored in pack files and may be removed separately with
522 and Git's garbage collector.
530 .Op Fl p Ar path-prefix
532 .Op Ar work-tree-path
535 Copy files from a repository into a new work tree.
536 Show the status of each affected file, using the following status codes:
537 .Bl -column YXZ description
538 .It A Ta new file was added
539 .It E Ta file already exists in work tree's meta-data
544 is not specified, either use the last component of
545 .Ar repository path ,
548 was specified use the last component of
556 Check out files from a commit on the specified
558 If this option is not specified, a branch resolved via the repository's HEAD
559 reference will be used.
561 Check out files from the specified
563 on the selected branch.
564 The expected argument is a commit ID SHA1 hash or an existing reference
565 or tag name which will be resolved to a commit ID.
566 An abbreviated hash argument will be expanded to a full SHA1 hash
567 automatically, provided the abbreviation is unique.
568 If this option is not specified, the most recent commit on the selected
573 is not contained in the selected branch, a different branch which contains
574 this commit must be specified with the
577 If no such branch is known, a new branch must be created for this
583 Checking out work trees with an unknown branch is intentionally not supported.
585 Proceed with the checkout operation even if the directory at
588 Existing files will be left intact.
589 .It Fl p Ar path-prefix
590 Restrict the work tree to a subset of the repository's tree hierarchy.
591 Only files beneath the specified
595 Silence progress output.
606 Update an existing work tree to a different
608 Change existing files in the work tree as necessary to match file contents
610 Preserve any local changes in the work tree and merge them with the
613 Files which already contain merge conflicts will not be updated to avoid
614 further complications.
615 Such files will be updated when
617 is run again after merge conflicts have been resolved.
618 If the conflicting changes are no longer needed, affected files can be
625 Show the status of each affected file, using the following status codes:
626 .Bl -column YXZ description
627 .It U Ta file was updated and contained no local changes
628 .It G Ta file was updated and local changes were merged cleanly
629 .It C Ta file was updated and conflicts occurred during merge
630 .It D Ta file was deleted
631 .It A Ta new file was added
632 .It \(a~ Ta versioned file is obstructed by a non-regular file
633 .It ! Ta a missing versioned file was restored
634 .It # Ta file was not updated because it contains merge conflicts
635 .It ? Ta changes destined for an unversioned file were not merged
640 is specified, update the entire work tree.
641 Otherwise, restrict the update operation to files at or within the
643 Each path is required to exist in the update operation's target commit.
644 Files in the work tree outside specified paths will remain unchanged and
645 will retain their previously recorded base commit.
648 commands may refuse to run while the work tree contains files from
649 multiple base commits.
650 The base commit of such a work tree can be made consistent by running
652 across the entire work tree.
655 is incompatible with the
660 cannot update paths with staged changes.
661 If changes have been staged with
663 these changes must first be committed with
673 Switch the work tree's branch reference to the specified
675 before updating the work tree.
676 This option requires that all paths in the work tree are updated.
678 As usual, any local changes in the work tree will be preserved.
679 This can be useful when switching to a newly created branch in order
680 to commit existing local changes to this branch.
682 Any local changes must be dealt with separately in order to obtain a
683 work tree with pristine file contents corresponding exactly to the specified
685 Such changes could first be committed to a different branch with
687 or could be discarded with
690 Update the work tree to the specified
692 The expected argument is a commit ID SHA1 hash or an existing reference
693 or tag name which will be resolved to a commit ID.
694 An abbreviated hash argument will be expanded to a full SHA1 hash
695 automatically, provided the abbreviation is unique.
696 If this option is not specified, the most recent commit on the work tree's
699 Silence progress output.
705 .Op Fl S Ar status-codes
706 .Op Fl s Ar status-codes
710 Show the current modification status of files in a work tree,
711 using the following status codes:
712 .Bl -column YXZ description
713 .It M Ta modified file
714 .It A Ta file scheduled for addition in next commit
715 .It D Ta file scheduled for deletion in next commit
716 .It C Ta modified or added file which contains merge conflicts
717 .It ! Ta versioned file was expected on disk but is missing
718 .It \(a~ Ta versioned file is obstructed by a non-regular file
719 .It ? Ta unversioned item not tracked by
721 .It m Ta modified file modes (executable bit only)
722 .It N Ta non-existent
724 specified on the command line
729 is specified, show modifications in the entire work tree.
730 Otherwise, show modifications at or within the specified paths.
732 If changes have been staged with
734 staged changes are shown in the second output column, using the following
736 .Bl -column YXZ description
737 .It M Ta file modification is staged
738 .It A Ta file addition is staged
739 .It D Ta file deletion is staged
742 Changes created on top of staged changes are indicated in the first column:
743 .Bl -column YXZ description
744 .It MM Ta file was modified after earlier changes have been staged
745 .It MA Ta file was modified after having been staged for addition
753 Show unversioned files even if they match an ignore pattern.
754 .It Fl S Ar status-codes
755 Suppress the output of files with a modification status matching any of the
756 single-character status codes contained in the
759 Any combination of codes from the above list of possible status codes
761 For staged files, status codes displayed in either column will be matched.
762 Cannot be used together with the
765 .It Fl s Ar status-codes
766 Only show files with a modification status matching any of the
767 single-character status codes contained in the
770 Any combination of codes from the above list of possible status codes
772 For staged files, status codes displayed in either column will be matched.
773 Cannot be used together with the
778 For compatibility with
789 files in each traversed directory and will not display unversioned files
790 which match these patterns.
795 supports consecutive asterisks,
797 which will match an arbitrary amount of directories.
801 only supports a single ignore pattern per line.
805 does not support negated ignore patterns prefixed with
807 and gives no special significance to the location of path component separators,
816 .Op Fl r Ar repository-path
817 .Op Fl S Ar search-pattern
821 Display history of a repository.
824 is specified, show only commits which modified this path.
825 If invoked in a work tree, the
827 is interpreted relative to the current working directory,
828 and the work tree's path prefix is implicitly prepended.
829 Otherwise, the path is interpreted relative to the repository root.
836 Display individual commits which were merged into the current branch
840 shows the linear history of the current branch only.
842 Set the number of context lines shown in diffs with
844 By default, 3 lines of context are shown.
846 Start traversing history at the specified
848 The expected argument is a commit ID SHA1 hash or an existing reference
849 or tag name which will be resolved to a commit ID.
850 An abbreviated hash argument will be expanded to a full SHA1 hash
851 automatically, provided the abbreviation is unique.
852 If this option is not specified, default to the work tree's current branch
853 if invoked in a work tree, or to the repository's HEAD reference.
855 Display diffstat of changes introduced in each commit.
856 Cannot be used with the
860 Limit history traversal to a given number of commits.
861 If this option is not specified, a default limit value of zero is used,
862 which is treated as an unbounded limit.
864 .Ev GOT_LOG_DEFAULT_LIMIT
865 environment variable may be set to change this default value.
867 Display the list of file paths changed in each commit, using the following
869 .Bl -column YXZ description
870 .It M Ta modified file
871 .It D Ta file was deleted
872 .It A Ta new file was added
873 .It m Ta modified file modes (executable bit only)
876 Cannot be used with the
880 Display the patch of modifications made in each commit.
883 is specified, only show the patch of modifications at or within this path.
884 Cannot be used with the
888 Determine a set of commits to display as usual, but display these commits
890 .It Fl r Ar repository-path
891 Use the repository at the specified path.
892 If not specified, assume the repository is located at or above the current
894 If this directory is a
896 work tree, use the repository path associated with this work tree.
897 .It Fl S Ar search-pattern
898 If specified, show only commits with a log message, author name,
899 committer name, or ID SHA1 hash matched by the extended regular
902 Lines in committed patches will be matched if
905 File paths changed by a commit will be matched if
908 Regular expression syntax is documented in
911 Display a short one-line summary of each commit, instead of the default
913 Cannot be used together with the
919 Stop traversing commit history immediately after the specified
922 This option has no effect if the specified
932 .Op Fl r Ar repository-path
933 .Op Ar object1 Ar object2 | Ar path ...
936 When invoked within a work tree without any arguments, display all
937 local changes in the work tree.
940 arguments are specified, only show changes within the specified paths.
942 If two arguments are provided, treat each argument as a reference, a tag
943 name, or an object ID SHA1 hash, and display differences between the
944 corresponding objects.
945 Both objects must be of the same type (blobs, trees, or commits).
946 An abbreviated hash argument will be expanded to a full SHA1 hash
947 automatically, provided the abbreviation is unique.
948 If none of these interpretations produce a valid result or if the
953 is running in a work tree, attempt to interpret the two arguments as paths.
960 Treat file contents as ASCII text even if binary data is detected.
962 Set the number of context lines shown in the diff.
963 By default, 3 lines of context are shown.
965 Show differences between commits in the repository.
966 This option may be used up to two times.
967 When used only once, show differences between the specified
969 and its first parent commit.
970 When used twice, show differences between the two specified commits.
972 The expected argument is a commit ID SHA1 hash or an existing reference
973 or tag name which will be resolved to a commit ID.
974 An abbreviated hash argument will be expanded to a full SHA1 hash
975 automatically, provided the abbreviation is unique.
979 option is used, all non-option arguments will be interpreted as paths.
982 arguments are provided, only show differences for the specified paths.
984 Cannot be used together with the
988 Display diffstat of changes before the actual diff by annotating each file path
989 or blob hash being diffed with the total number of lines added and removed.
990 A summary line will display the total number of changes across all files.
992 Interpret all arguments as paths only.
993 This option can be used to resolve ambiguity in cases where paths
994 look like tag names, reference names, or object IDs.
995 This option is only valid when
997 is invoked in a work tree.
998 .It Fl r Ar repository-path
999 Use the repository at the specified path.
1000 If not specified, assume the repository is located at or above the current
1002 If this directory is a
1004 work tree, use the repository path associated with this work tree.
1006 Show changes staged with
1008 instead of showing local changes in the work tree.
1009 This option is only valid when
1011 is invoked in a work tree.
1013 Ignore whitespace-only changes.
1019 .Op Fl r Ar repository-path
1023 Display line-by-line history of a file at the specified path.
1030 Start traversing history at the specified
1032 The expected argument is a commit ID SHA1 hash or an existing reference
1033 or tag name which will be resolved to a commit ID.
1034 An abbreviated hash argument will be expanded to a full SHA1 hash
1035 automatically, provided the abbreviation is unique.
1036 .It Fl r Ar repository-path
1037 Use the repository at the specified path.
1038 If not specified, assume the repository is located at or above the current
1040 If this directory is a
1042 work tree, use the repository path associated with this work tree.
1049 .Op Fl r Ar repository-path
1053 Display a listing of files and directories at the specified
1054 directory path in the repository.
1055 Entries shown in this listing may carry one of the following trailing
1057 .Bl -column YXZ description
1058 .It @ Ta entry is a symbolic link
1059 .It / Ta entry is a directory
1060 .It * Ta entry is an executable file
1061 .It $ Ta entry is a Git submodule
1064 Symbolic link entries are also annotated with the target path of the link.
1068 is specified, list the repository path corresponding to the current
1069 directory of the work tree, or the root directory of the repository
1070 if there is no work tree.
1077 List files and directories as they appear in the specified
1079 The expected argument is a commit ID SHA1 hash or an existing reference
1080 or tag name which will be resolved to a commit ID.
1081 An abbreviated hash argument will be expanded to a full SHA1 hash
1082 automatically, provided the abbreviation is unique.
1084 Show object IDs of files (blob objects) and directories (tree objects).
1086 Recurse into sub-directories in the repository.
1087 .It Fl r Ar repository-path
1088 Use the repository at the specified path.
1089 If not specified, assume the repository is located at or above the current
1091 If this directory is a
1093 work tree, use the repository path associated with this work tree.
1099 .Op Fl r Ar repository-path
1100 .Op Fl s Ar reference
1103 Manage references in a repository.
1105 References may be listed, created, deleted, and changed.
1106 When creating, deleting, or changing a reference the specified
1108 must be an absolute reference name, i.e. it must begin with
1116 Create a reference or change an existing reference.
1117 The reference with the specified
1119 will point at the specified
1123 argument is a ID SHA1 hash or an existing reference or tag name which will
1124 be resolved to the ID of a corresponding commit, tree, tag, or blob object.
1125 Cannot be used together with any other options except
1128 Delete the reference with the specified
1130 from the repository.
1131 Any commit, tree, tag, and blob objects belonging to deleted references
1132 remain in the repository and may be removed separately with
1133 Git's garbage collector or
1134 .Cm gotadmin cleanup .
1135 Cannot be used together with any other options except
1138 List references in the repository.
1141 is specified, list all existing references in the repository.
1144 is a reference namespace, list all references in this namespace.
1145 Otherwise, show only the reference with the given
1147 Cannot be used together with any other options except
1151 .It Fl r Ar repository-path
1152 Use the repository at the specified path.
1153 If not specified, assume the repository is located at or above the current
1155 If this directory is a
1157 work tree, use the repository path associated with this work tree.
1158 .It Fl s Ar reference
1159 Create a symbolic reference, or change an existing symbolic reference.
1160 The symbolic reference with the specified
1162 will point at the specified
1164 which must already exist in the repository.
1165 Care should be taken not to create loops between references when
1166 this option is used.
1167 Cannot be used together with any other options except
1170 Sort listed references by modification time (most recently modified first)
1171 instead of sorting by lexicographical order.
1172 Use of this option requires the
1174 option to be used as well.
1182 .Op Fl r Ar repository-path
1186 Create, list, or delete branches.
1188 Local branches are managed via references which live in the
1190 reference namespace.
1193 command creates references in this namespace only.
1195 When deleting branches, the specified
1199 reference namespace first.
1200 If no corresponding branch is found, the
1202 namespace will be searched next.
1204 If invoked in a work tree without any arguments, print the name of the
1205 work tree's current branch.
1209 argument is passed, attempt to create a branch reference with the given name.
1210 By default the new branch reference will point at the latest commit on the
1211 work tree's current branch if invoked in a work tree, and otherwise to a commit
1212 resolved via the repository's HEAD reference.
1214 If invoked in a work tree, once the branch was created successfully
1215 switch the work tree's head reference to the newly created branch and
1216 update files across the entire work tree, just like
1217 .Cm got update -b Ar name
1219 Show the status of each affected file, using the following status codes:
1220 .Bl -column YXZ description
1221 .It U Ta file was updated and contained no local changes
1222 .It G Ta file was updated and local changes were merged cleanly
1223 .It C Ta file was updated and conflicts occurred during merge
1224 .It D Ta file was deleted
1225 .It A Ta new file was added
1226 .It \(a~ Ta versioned file is obstructed by a non-regular file
1227 .It ! Ta a missing versioned file was restored
1235 Make a newly created branch reference point at the specified
1239 argument is a commit ID SHA1 hash or an existing reference
1240 or tag name which will be resolved to a commit ID.
1242 Delete the branch with the specified
1248 reference namespace.
1250 Only the branch reference is deleted.
1251 Any commit, tree, and blob objects belonging to the branch
1252 remain in the repository and may be removed separately with
1253 Git's garbage collector or
1254 .Cm gotadmin cleanup .
1256 List all existing branches in the repository, including copies of remote
1257 repositories' branches in the
1259 reference namespace.
1261 If invoked in a work tree, the work tree's current branch is shown
1262 with one the following annotations:
1263 .Bl -column YXZ description
1264 .It * Ta work tree's base commit matches the branch tip
1265 .It \(a~ Ta work tree's base commit is out-of-date
1268 Do not switch and update the work tree after creating a new branch.
1269 .It Fl r Ar repository-path
1270 Use the repository at the specified path.
1271 If not specified, assume the repository is located at or above the current
1273 If this directory is a
1275 work tree, use the repository path associated with this work tree.
1277 Sort listed branches by modification time (most recently modified first)
1278 instead of sorting by lexicographical order.
1281 reference namespace are listed before branches in
1284 Use of this option requires the
1286 option to be used as well.
1293 .Op Fl r Ar repository-path
1294 .Op Fl s Ar signer-id
1297 Manage tags in a repository.
1299 Tags are managed via references which live in the
1301 reference namespace.
1304 command operates on references in this namespace only.
1305 References in this namespace point at tag objects which contain a pointer
1306 to another object, a tag message, as well as author and timestamp information.
1308 Attempt to create a tag with the given
1310 and make this tag point at the given
1312 If no commit is specified, default to the latest commit on the work tree's
1313 current branch if invoked in a work tree, and to a commit resolved via
1314 the repository's HEAD reference otherwise.
1321 Make the newly created tag reference point at the specified
1325 argument is a commit ID SHA1 hash or an existing reference or tag name which
1326 will be resolved to a commit ID.
1327 An abbreviated hash argument will be expanded to a full SHA1 hash
1328 automatically, provided the abbreviation is unique.
1330 List all existing tags in the repository instead of creating a new tag.
1333 argument is passed, show only the tag with the given
1336 Use the specified tag message when creating the new tag.
1341 opens a temporary file in an editor where a tag message can be written.
1342 .It Fl r Ar repository-path
1343 Use the repository at the specified path.
1344 If not specified, assume the repository is located at or above the current
1346 If this directory is a
1348 work tree, use the repository path associated with this work tree.
1349 .It Fl s Ar signer-id
1350 While creating a new tag, sign this tag with the identity given in
1353 For SSH-based signatures,
1355 is the path to a file which may refer to either a private SSH key,
1356 or a public SSH key with the private half available via
1359 will sign the tag object by invoking
1363 command, using the signature namespace
1365 for compatibility with
1368 Verify tag object signatures.
1371 is specified, show and verify the tag object with the provided name.
1372 Otherwise, list all tag objects and verify signatures where present.
1375 verifies SSH-based signatures by invoking
1378 .Fl Y Cm verify Fl f Ar allowed_signers .
1383 otherwise verification is impossible.
1386 During SSH signature creation and verification this option will be passed to
1388 Multiple -v options increase the verbosity.
1394 command will not delete tags or change existing tags.
1395 If a tag must be deleted, the
1397 command may be used to delete a tag's reference.
1398 This should only be done if the tag has not already been copied to
1405 Schedule unversioned files in a work tree for addition to the
1406 repository in the next commit.
1407 By default, files which match a
1409 ignore pattern will not be added.
1416 Add files even if they match a
1420 Permit recursion into directories.
1421 If this option is not specified,
1423 will refuse to run if a specified
1431 .Op Fl s Ar status-codes
1435 Remove versioned files from a work tree and schedule them for deletion
1436 from the repository in the next commit.
1443 Perform the operation even if a file contains local modifications,
1444 and do not raise an error if a specified
1446 does not exist on disk.
1448 Keep affected files on disk.
1450 Permit recursion into directories.
1451 If this option is not specified,
1453 will refuse to run if a specified
1456 .It Fl s Ar status-codes
1457 Only delete files with a modification status matching one of the
1458 single-character status codes contained in the
1461 The following status codes may be specified:
1462 .Bl -column YXZ description
1463 .It M Ta modified file (this implies the
1466 .It ! Ta versioned file expected on disk but missing
1474 .Op Fl p Ar strip-count
1480 to files in a work tree.
1481 Files added or removed by a patch will be scheduled for addition or removal in
1484 The patch must be in the unified diff format as produced by
1491 diff when invoked with their
1496 argument is provided, read unified diff data from standard input instead.
1500 contains multiple patches, then attempt to apply each of them in sequence.
1502 Show the status of each affected file, using the following status codes:
1503 .Bl -column XYZ description
1504 .It M Ta file was modified
1505 .It G Ta file was merged using a merge-base found in the repository
1506 .It C Ta file was merged and conflicts occurred during merge
1507 .It D Ta file was deleted
1508 .It A Ta file was added
1509 .It # Ta failed to patch the file
1512 If a change does not match at its exact line number, attempt to
1513 apply it somewhere else in the file if a good spot can be found.
1514 Otherwise, the patch will fail to apply.
1518 will refuse to apply a patch if certain preconditions are not met.
1519 Files to be deleted must already be under version control, and must
1520 not have been scheduled for deletion already.
1521 Files to be added must not yet be under version control and must not
1522 already be present on disk.
1523 Files to be modified must already be under version control and may not
1524 contain conflict markers.
1526 If an error occurs, the
1528 operation will be aborted.
1529 Any changes made to the work tree up to this point will be left behind.
1530 Such changes can be viewed with
1532 and can be reverted with
1541 Attempt to locate files within the specified
1543 for use as a merge-base for 3-way merges.
1544 Ideally, the specified
1546 should contain versions of files which the changes contained in the
1549 Files will be located by path, relative to the repository root.
1552 option is used then leading path components will be stripped
1553 before paths are looked up in the repository.
1557 option is not used then
1559 will attempt to locate merge-bases via object IDs found in
1561 meta-data, such as produced by
1567 option is only recommended in the absence of such meta-data.
1569 In case no merge-base is available for a file, changes will be applied
1570 without doing a 3-way merge.
1571 Changes which do not apply cleanly may then be rejected entirely, rather
1572 than producing merge conflicts in the patched target file.
1574 Do not make any modifications to the work tree.
1575 This can be used to check whether a patch would apply without issues.
1578 contains diffs that affect the same file multiple times, the results
1579 displayed may be incorrect.
1580 .It Fl p Ar strip-count
1581 Specify the number of leading path components to strip from paths
1590 path prefixes generated by
1592 will be recognized and stripped automatically.
1594 Reverse the patch before applying it.
1600 .Op Fl F Ar response-script
1604 Revert any local changes in files at the specified paths in a work tree.
1605 File contents will be overwritten with those contained in the
1606 work tree's base commit.
1607 There is no way to bring discarded changes back after
1610 If a file was added with
1612 it will become an unversioned file again.
1613 If a file was deleted with
1615 it will be restored.
1621 .It Fl F Ar response-script
1629 responses line-by-line from the specified
1631 file instead of prompting interactively.
1633 Instead of reverting all changes in files, interactively select or reject
1634 changes to revert based on
1640 (quit reverting this file) responses.
1641 If a file is in modified status, individual patches derived from the
1642 modified file content can be reverted.
1643 Files in added or deleted status may only be reverted in their entirety.
1645 Permit recursion into directories.
1646 If this option is not specified,
1648 will refuse to run if a specified
1662 Create a new commit in the repository from changes in a work tree
1663 and use this commit as the new base commit for the work tree.
1666 is specified, commit all changes in the work tree.
1667 Otherwise, commit changes at or within the specified paths.
1669 If changes have been explicitly staged for commit with
1671 only commit staged changes and reject any specified paths which
1672 have not been staged.
1675 opens a temporary file in an editor where a log message can be written
1683 options are used together.
1685 Show the status of each affected file, using the following status codes:
1686 .Bl -column YXZ description
1687 .It M Ta modified file
1688 .It D Ta file was deleted
1689 .It A Ta new file was added
1690 .It m Ta modified file modes (executable bit only)
1693 Files which are not part of the new commit will retain their previously
1694 recorded base commit.
1697 commands may refuse to run while the work tree contains files from
1698 multiple base commits.
1699 The base commit of such a work tree can be made consistent by running
1701 across the entire work tree.
1705 command requires the
1707 environment variable to be set,
1708 unless an author has been configured in
1714 configuration settings can be
1715 obtained from the repository's
1717 file or from Git's global
1726 Set author information in the newly created commit to
1728 This is useful when committing changes on behalf of someone else.
1731 argument must use the same format as the
1733 environment variable.
1735 In addition to storing author information, the newly created commit
1738 information which is obtained, as usual, from the
1740 environment variable, or
1742 or Git configuration settings.
1744 Allow committing files in conflicted status.
1746 Committing files with conflict markers should generally be avoided.
1747 Cases where conflict markers must be stored in the repository for
1748 some legitimate reason should be very rare.
1749 There are usually ways to avoid storing conflict markers verbatim by
1750 applying appropriate programming tricks.
1752 Use the prepared log message stored in the file found at
1754 when creating the new commit.
1756 opens a temporary file in an editor where the prepared log message can be
1757 reviewed and edited further if needed.
1758 Cannot be used together with the
1762 Use the specified log message when creating the new commit.
1763 Cannot be used together with the
1767 This option prevents
1769 from opening the commit message in an editor.
1770 It has no effect unless it is used together with the
1772 option and is intended for non-interactive use such as scripting.
1774 This option prevents
1776 from generating a diff of the to-be-committed changes in a temporary file
1777 which can be viewed while editing a commit message.
1779 Allow the addition of symbolic links which point outside of the path space
1780 that is under version control.
1783 will reject such symbolic links due to safety concerns.
1786 may decide to represent such a symbolic link as a regular file which contains
1787 the link's target path, rather than creating an actual symbolic link which
1788 points outside of the work tree.
1789 Use of this option is discouraged because external mechanisms such as
1791 are better suited for managing symbolic links to paths not under
1796 will refuse to run if certain preconditions are not met.
1797 If the work tree's current branch is not in the
1799 reference namespace, new commits may not be created on this branch.
1800 Local changes may only be committed if they are based on file content
1801 found in the most recent commit on the work tree's branch.
1802 If a path is found to be out of date,
1804 must be used first in order to merge local changes with changes made
1812 .Op Fl r Ar repository-path
1814 .Op Ar remote-repository
1817 Send new changes to a remote repository.
1819 .Ar remote-repository
1823 The remote repository's URL is obtained from the corresponding entry in
1827 file of the local repository, as created by
1830 All objects corresponding to new changes will be written to a temporary
1831 pack file which is then uploaded to the server.
1832 Upon success, references in the
1834 reference namespace of the local repository will be updated to point at
1835 the commits which have been sent.
1837 By default, changes will only be sent if they are based on up-to-date
1838 copies of relevant branches in the remote repository.
1839 If any changes to be sent are based on out-of-date copies or would
1840 otherwise break linear history of existing branches, new changes must
1841 be fetched from the server with
1843 and local branches must be rebased with
1850 option can be used to make exceptions to these requirements.
1857 Send all branches from the local repository's
1859 reference namespace.
1862 option is equivalent to listing all branches with multiple
1865 Cannot be used together with the
1871 from the local repository's
1873 reference namespace.
1874 This option may be specified multiple times to build a list of branches
1876 If this option is not specified, default to the work tree's current branch
1877 if invoked in a work tree, or to the repository's HEAD reference.
1878 Cannot be used together with the
1882 Delete the specified
1884 from the remote repository's
1886 reference namespace.
1887 This option may be specified multiple times to build a list of branches
1890 Only references are deleted.
1891 Any commit, tree, tag, and blob objects belonging to deleted branches
1892 may become subject to deletion by Git's garbage collector running on
1895 Requesting deletion of branches results in an error if the server
1896 does not support this feature or disallows the deletion of branches
1897 based on its configuration.
1899 Attempt to force the server to overwrite existing branches or tags
1900 in the remote repository, even when
1904 would usually be required before changes can be sent.
1905 The server may reject forced requests regardless, depending on its
1908 Any commit, tree, tag, and blob objects belonging to overwritten branches
1909 or tags may become subject to deletion by Git's garbage collector running
1914 reference namespace is globally shared between all repositories.
1917 option to overwrite tags is discouraged because it can lead to
1918 inconsistencies between the tags present in different repositories.
1919 In general, creating a new tag with a different name is recommended
1920 instead of overwriting an existing tag.
1924 option is particularly discouraged if changes being sent are based
1925 on an out-of-date copy of a branch in the remote repository.
1926 Instead of using the
1928 option, new changes should
1931 and local branches should be rebased with
1933 followed by another attempt to send the changes.
1937 option should only be needed in situations where the remote repository's
1938 copy of a branch or tag is known to be out-of-date and is considered
1940 The risks of creating inconsistencies between different repositories
1941 should also be taken into account.
1943 Suppress progress reporting output.
1944 The same option will be passed to
1947 .It Fl r Ar repository-path
1948 Use the repository at the specified path.
1949 If not specified, assume the repository is located at or above the current
1951 If this directory is a
1953 work tree, use the repository path associated with this work tree.
1955 Attempt to send all tags from the local repository's
1957 reference namespace.
1960 option is equivalent to listing all tags with multiple
1963 Cannot be used together with the
1969 from the local repository's
1971 reference namespace, in addition to any branches that are being sent.
1974 option may be specified multiple times to build a list of tags to send.
1975 No tags will be sent if the
1979 Raise an error if the specified
1981 already exists in the remote repository, unless the
1983 option is used to overwrite the server's copy of the tag.
1984 In general, creating a new tag with a different name is recommended
1985 instead of overwriting an existing tag.
1987 Cannot be used together with the
1994 to print debugging messages to standard error output.
1995 The same option will be passed to
1998 Multiple -v options increase the verbosity.
2008 Merge changes from a single
2013 should be on a different branch than the work tree's base commit.
2014 The expected argument is a reference or a commit ID SHA1 hash.
2015 An abbreviated hash argument will be expanded to a full SHA1 hash
2016 automatically, provided the abbreviation is unique.
2018 Show the status of each affected file, using the following status codes:
2019 .Bl -column YXZ description
2020 .It G Ta file was merged
2021 .It C Ta file was merged and conflicts occurred during merge
2022 .It ! Ta changes destined for a missing file were not merged
2023 .It D Ta file was deleted
2024 .It d Ta file's deletion was prevented by local modifications
2025 .It A Ta new file was added
2026 .It \(a~ Ta changes destined for a non-regular file were not merged
2027 .It ? Ta changes destined for an unversioned file were not merged
2030 The merged changes will appear as local changes in the work tree, which
2033 amended manually or with further
2039 If invoked in a work tree where no
2044 operation is taking place,
2046 creates a record of commits which have been merged into the work tree.
2047 When a file changed by
2051 the log messages of relevant merged commits will then appear in the editor,
2052 where the messages should be further adjusted to convey the reasons for
2053 cherrypicking the changes.
2054 Upon exiting the editor, if the time stamp of the log message file
2055 is unchanged or the log message is empty,
2057 will fail with an unmodified or empty log message error.
2059 If all the changes in all files touched by a given commit are discarded,
2062 this commit's log message record will also disappear.
2065 will refuse to run if certain preconditions are not met.
2066 If the work tree contains multiple base commits, it must first be updated
2067 to a single base commit with
2069 If any relevant files already contain merge conflicts, these
2070 conflicts must be resolved first.
2078 Display a list of commit log messages recorded by cherrypick operations,
2079 represented by references in the
2080 .Dq refs/got/worktree
2081 reference namespace.
2084 is specified, only show the log message of the specified commit.
2086 If invoked in a work tree, only log messages recorded by cherrypick operations
2087 in the current work tree will be displayed.
2088 Otherwise, all commit log messages will be displayed irrespective of the
2089 work tree in which they were created.
2090 This option cannot be used with
2093 Delete log messages created by previous cherrypick operations, represented by
2095 .Dq refs/got/worktree
2096 reference namespace.
2099 is specified, only delete the log message of the specified commit.
2101 If invoked in a work tree, only log messages recorded by cherrypick operations
2102 in the current work tree will be deleted.
2103 Otherwise, all commit log messages will be deleted irrespective of the
2104 work tree in which they were created.
2105 This option cannot be used with
2116 Reverse-merge changes from a single
2121 should be on the same branch as the work tree's base commit.
2122 The expected argument is a reference or a commit ID SHA1 hash.
2123 An abbreviated hash argument will be expanded to a full SHA1 hash
2124 automatically, provided the abbreviation is unique.
2126 Show the status of each affected file, using the following status codes:
2127 .Bl -column YXZ description
2128 .It G Ta file was merged
2129 .It C Ta file was merged and conflicts occurred during merge
2130 .It ! Ta changes destined for a missing file were not merged
2131 .It D Ta file was deleted
2132 .It d Ta file's deletion was prevented by local modifications
2133 .It A Ta new file was added
2134 .It \(a~ Ta changes destined for a non-regular file were not merged
2135 .It ? Ta changes destined for an unversioned file were not merged
2138 The reverse-merged changes will appear as local changes in the work tree,
2139 which may be viewed with
2141 amended manually or with further
2147 If invoked in a work tree where no
2152 operation is taking place,
2154 creates a record of commits which have been reverse-merged into the work tree.
2155 When a file changed by
2159 the log messages of relevant reverse-merged commits will then appear in
2160 the editor, where the messages should be further adjusted to convey the
2161 reasons for backing out the changes.
2162 Upon exiting the editor, if the time stamp of the log message file
2163 is unchanged or the log message is empty,
2165 will fail with an unmodified or empty log message error.
2167 If all the changes in all files touched by a given commit are discarded,
2170 this commit's log message record will also disappear.
2173 will refuse to run if certain preconditions are not met.
2174 If the work tree contains multiple base commits, it must first be updated
2175 to a single base commit with
2177 If any relevant files already contain merge conflicts, these
2178 conflicts must be resolved first.
2186 Display a list of commit log messages recorded by backout operations,
2187 represented by references in the
2188 .Dq refs/got/worktree
2189 reference namespace.
2192 is specified, only show the log message of the specified commit.
2194 If invoked in a work tree, only log messages recorded by backout operations
2195 in the current work tree will be displayed.
2196 Otherwise, all commit log messages will be displayed irrespective of the
2197 work tree in which they were created.
2198 This option cannot be used with
2201 Delete log messages created by previous backout operations, represented by
2203 .Dq refs/got/worktree
2204 reference namespace.
2207 is specified, only delete the log message of the specified commit.
2209 If invoked in a work tree, only log messages recorded by backout operations
2210 in the current work tree will be deleted.
2211 Otherwise, all commit log messages will be deleted irrespective of the
2212 work tree in which they were created.
2213 This option cannot be used with
2224 Rebase commits on the specified
2226 onto the tip of the current branch of the work tree.
2229 must share common ancestry with the work tree's current branch.
2230 Rebasing begins with the first descendant commit of the youngest
2231 common ancestor commit shared by the specified
2233 and the work tree's current branch, and stops once the tip commit
2240 is used as intended, the specified
2242 represents a local commit history and may already contain changes
2243 that are not yet visible in any other repositories.
2244 The work tree's current branch, which must be set with
2248 operation, represents a branch from a remote repository which shares
2249 a common history with the specified
2251 but has progressed, and perhaps diverged, due to commits added to the
2254 Rebased commits are accumulated on a temporary branch which the work tree
2255 will remain switched to throughout the entire rebase operation.
2256 Commits on this branch represent the same changes with the same log
2257 messages as their counterparts on the original
2259 but with different commit IDs.
2260 Once rebasing has completed successfully, the temporary branch becomes
2261 the new version of the specified
2263 and the work tree is automatically switched to it.
2264 If author information is available via the
2266 environment variable,
2272 configuration settings, this author information will be used to identify
2277 Old commits in their pre-rebase state are automatically backed up in the
2278 .Dq refs/got/backup/rebase
2279 reference namespace.
2280 As long as these references are not removed older versions of rebased
2281 commits will remain in the repository and can be viewed with the
2284 Removal of these references makes objects which become unreachable via
2285 any reference subject to removal by Git's garbage collector or
2286 .Cm gotadmin cleanup .
2288 While rebasing commits, show the status of each affected file,
2289 using the following status codes:
2290 .Bl -column YXZ description
2291 .It G Ta file was merged
2292 .It C Ta file was merged and conflicts occurred during merge
2293 .It ! Ta changes destined for a missing file were not merged
2294 .It D Ta file was deleted
2295 .It d Ta file's deletion was prevented by local modifications
2296 .It A Ta new file was added
2297 .It \(a~ Ta changes destined for a non-regular file were not merged
2298 .It ? Ta changes destined for an unversioned file were not merged
2301 If merge conflicts occur, the rebase operation is interrupted and may
2302 be continued once conflicts have been resolved.
2303 If any files with destined changes are found to be missing or unversioned,
2304 or if files could not be deleted due to differences in deleted content,
2305 the rebase operation will be interrupted to prevent potentially incomplete
2306 changes from being committed to the repository without user intervention.
2307 The work tree may be modified as desired and the rebase operation can be
2308 continued once the changes present in the work tree are considered complete.
2309 Alternatively, the rebase operation may be aborted which will leave
2311 unmodified and the work tree switched back to its original branch.
2313 If a merge conflict is resolved in a way which renders the merged
2314 change into a no-op change, the corresponding commit will be elided
2315 when the rebase operation continues.
2318 will refuse to run if certain preconditions are not met.
2323 reference namespace, the branch may not be rebased.
2324 If the work tree is not yet fully updated to the tip commit of its
2325 branch, then the work tree must first be updated with
2327 If changes have been staged with
2329 these changes must first be committed with
2333 If the work tree contains local changes, these changes must first be
2340 contains changes to files outside of the work tree's path prefix,
2341 the work tree cannot be used to rebase this branch.
2350 commands will refuse to run while a rebase operation is in progress.
2351 Other commands which manipulate the work tree may be used for
2352 conflict resolution purposes.
2356 is already based on the work tree's current branch, then no commits
2357 need to be rebased and
2359 will simply switch the work tree to the specified
2361 and update files in the work tree accordingly.
2368 Abort an interrupted rebase operation.
2369 If this option is used, no other command-line arguments are allowed.
2371 Allow a rebase operation to continue with files in conflicted status.
2372 This option should generally be avoided, and can only be used with the
2376 Continue an interrupted rebase operation.
2377 If this option is used, no other command-line arguments are allowed.
2379 Show a list of past rebase operations, represented by references in the
2380 .Dq refs/got/backup/rebase
2381 reference namespace.
2383 Display the author, date, and log message of each backed up commit,
2384 the object ID of the corresponding post-rebase commit, and
2385 the object ID of their common ancestor commit.
2386 Given these object IDs,
2393 options can be used to examine the history of either version of the branch,
2398 option can be used to create a new branch from a pre-rebase state if desired.
2402 is specified, only show commits which at some point in time represented this
2404 Otherwise, list all backed up commits for any branches.
2406 If this option is used,
2408 does not require a work tree.
2409 None of the other options can be used together with
2412 Delete backups created by past rebase operations, represented by references
2414 .Dq refs/got/backup/rebase
2415 reference namespace.
2419 is specified, only delete backups which at some point in time represented
2421 Otherwise, delete all references found within
2422 .Dq refs/got/backup/rebase .
2424 Any commit, tree, tag, and blob objects belonging to deleted backups
2425 remain in the repository and may be removed separately with
2426 Git's garbage collector or
2427 .Cm gotadmin cleanup .
2429 If this option is used,
2431 does not require a work tree.
2432 None of the other options can be used together with
2439 .Op Fl F Ar histedit-script
2443 Edit commit history between the work tree's current base commit and
2444 the tip commit of the work tree's current branch.
2448 command requires the
2450 environment variable to be set,
2451 unless an author has been configured in
2457 configuration settings can be obtained from the repository's
2459 file or from Git's global
2465 operation, the work tree's current branch must be set with
2467 to the branch which should be edited, unless this branch is already the
2468 current branch of the work tree.
2469 The tip of this branch represents the upper bound (inclusive) of commits
2474 Furthermore, the work tree's base commit
2477 to a point in this branch's commit history where editing should begin.
2478 This commit represents the lower bound (non-inclusive) of commits touched
2483 Editing of commit history is controlled via a
2485 which can be written in an editor based on a template, passed on the
2486 command line, or generated with the
2492 The format of the histedit script is line-based.
2493 Each line in the script begins with a command name, followed by
2494 whitespace and an argument.
2495 For most commands, the expected argument is a commit ID SHA1 hash.
2496 Any remaining text on the line is ignored.
2497 Lines which begin with the
2499 character are ignored entirely.
2501 The available histedit script commands are as follows:
2502 .Bl -column YXZ pick-commit
2503 .It Cm pick Ar commit Ta Use the specified commit as it is.
2504 .It Cm edit Ar commit Ta Use the specified commit but once changes have been
2505 merged into the work tree interrupt the histedit operation for amending.
2506 .It Cm fold Ar commit Ta Combine the specified commit with the next commit
2507 listed further below that will be used.
2508 .It Cm drop Ar commit Ta Remove this commit from the edited history.
2509 .It Cm mesg Oo Ar log-message Oc Ta Create a new log message for the commit of
2514 command on the previous line of the histedit script.
2517 argument provides a new single-line log message to use.
2520 argument is omitted, open an editor where a new log message can be written.
2523 Every commit in the history being edited must be mentioned in the script.
2524 Lines may be re-ordered to change the order of commits in the edited history.
2525 No commit may be listed more than once.
2527 Edited commits are accumulated on a temporary branch which the work tree
2528 will remain switched to throughout the entire histedit operation.
2529 Once history editing has completed successfully, the temporary branch becomes
2530 the new version of the work tree's branch and the work tree is automatically
2533 Old commits in their pre-histedit state are automatically backed up in the
2534 .Dq refs/got/backup/histedit
2535 reference namespace.
2536 As long as these references are not removed older versions of edited
2537 commits will remain in the repository and can be viewed with the
2540 Removal of these references makes objects which become unreachable via
2541 any reference subject to removal by Git's garbage collector or
2542 .Cm gotadmin cleanup .
2544 While merging commits, show the status of each affected file,
2545 using the following status codes:
2546 .Bl -column YXZ description
2547 .It G Ta file was merged
2548 .It C Ta file was merged and conflicts occurred during merge
2549 .It ! Ta changes destined for a missing file were not merged
2550 .It D Ta file was deleted
2551 .It d Ta file's deletion was prevented by local modifications
2552 .It A Ta new file was added
2553 .It \(a~ Ta changes destined for a non-regular file were not merged
2554 .It ? Ta changes destined for an unversioned file were not merged
2557 If merge conflicts occur, the histedit operation is interrupted and may
2558 be continued once conflicts have been resolved.
2559 If any files with destined changes are found to be missing or unversioned,
2560 or if files could not be deleted due to differences in deleted content,
2561 the histedit operation will be interrupted to prevent potentially incomplete
2562 changes from being committed to the repository without user intervention.
2563 The work tree may be modified as desired and the histedit operation can be
2564 continued once the changes present in the work tree are considered complete.
2565 Alternatively, the histedit operation may be aborted which will leave
2566 the work tree switched back to its original branch.
2568 If a merge conflict is resolved in a way which renders the merged
2569 change into a no-op change, the corresponding commit will be elided
2570 when the histedit operation continues.
2573 will refuse to run if certain preconditions are not met.
2574 If the work tree's current branch is not in the
2576 reference namespace, the history of the branch may not be edited.
2577 If the work tree contains multiple base commits, it must first be updated
2578 to a single base commit with
2580 If changes have been staged with
2582 these changes must first be committed with
2586 If the work tree contains local changes, these changes must first be
2591 If the edited history contains changes to files outside of the work tree's
2592 path prefix, the work tree cannot be used to edit the history of this branch.
2600 commands will refuse to run while a histedit operation is in progress.
2601 Other commands which manipulate the work tree may be used, and the
2603 command may be used to commit arbitrary changes to the temporary branch
2604 while the histedit operation is interrupted.
2611 Abort an interrupted histedit operation.
2612 If this option is used, no other command-line arguments are allowed.
2614 Allow a histedit operation to continue with files in conflicted status.
2615 This option should generally be avoided, and can only be used with the
2619 Continue an interrupted histedit operation.
2620 If this option is used, no other command-line arguments are allowed.
2623 This option is a quick equivalent to a histedit script which drops all
2627 option can only be used when starting a new histedit operation.
2628 If this option is used, no other command-line arguments are allowed.
2630 Interrupt the histedit operation for editing after merging each commit.
2631 This option is a quick equivalent to a histedit script which uses the
2633 command for all commits.
2636 option can only be used when starting a new histedit operation.
2637 If this option is used, no other command-line arguments are allowed.
2638 .It Fl F Ar histedit-script
2641 instead of opening a temporary file in an editor where a histedit script
2644 Fold all commits into a single commit.
2645 This option is a quick equivalent to a histedit script which folds all
2646 commits, combining them all into one commit.
2649 option can only be used when starting a new histedit operation.
2650 If this option is used, no other command-line arguments are allowed.
2652 Show a list of past histedit operations, represented by references in the
2653 .Dq refs/got/backup/histedit
2654 reference namespace.
2656 Display the author, date, and log message of each backed up commit,
2657 the object ID of the corresponding post-histedit commit, and
2658 the object ID of their common ancestor commit.
2659 Given these object IDs,
2666 options can be used to examine the history of either version of the branch,
2671 option can be used to create a new branch from a pre-histedit state if desired.
2675 is specified, only show commits which at some point in time represented this
2677 Otherwise, list all backed up commits for any branches.
2679 If this option is used,
2681 does not require a work tree.
2682 None of the other options can be used together with
2685 Edit log messages only.
2686 This option is a quick equivalent to a histedit script which edits
2687 only log messages but otherwise leaves every picked commit as-is.
2690 option can only be used when starting a new histedit operation.
2691 If this option is used, no other command-line arguments are allowed.
2693 Delete backups created by past histedit operations, represented by references
2695 .Dq refs/got/backup/histedit
2696 reference namespace.
2700 is specified, only delete backups which at some point in time represented
2702 Otherwise, delete all references found within
2703 .Dq refs/got/backup/histedit .
2705 Any commit, tree, tag, and blob objects belonging to deleted backups
2706 remain in the repository and may be removed separately with
2707 Git's garbage collector or
2708 .Cm gotadmin cleanup .
2710 If this option is used,
2712 does not require a work tree.
2713 None of the other options can be used together with
2717 .It Cm integrate Ar branch
2719 Integrate the specified
2721 into the work tree's current branch.
2722 Files in the work tree are updated to match the contents on the integrated
2724 and the reference of the work tree's branch is changed to point at the
2725 head commit of the integrated
2728 Both branches can be considered equivalent after integration since they
2729 will be pointing at the same commit.
2730 Both branches remain available for future work, if desired.
2731 In case the integrated
2733 is no longer needed it may be deleted with
2736 Show the status of each affected file, using the following status codes:
2737 .Bl -column YXZ description
2738 .It U Ta file was updated
2739 .It D Ta file was deleted
2740 .It A Ta new file was added
2741 .It \(a~ Ta versioned file is obstructed by a non-regular file
2742 .It ! Ta a missing versioned file was restored
2746 will refuse to run if certain preconditions are not met.
2747 Most importantly, the
2749 must have been rebased onto the work tree's current branch with
2751 before it can be integrated, in order to linearize commit history and
2752 resolve merge conflicts.
2753 If the work tree contains multiple base commits, it must first be updated
2754 to a single base commit with
2756 If changes have been staged with
2758 these changes must first be committed with
2762 If the work tree contains local changes, these changes must first be
2774 Create a merge commit based on the current branch of the work tree and
2777 If a linear project history is desired, then use of
2779 should be preferred over
2781 However, even strictly linear projects may require merge commits in order
2782 to merge in new versions of third-party code stored on vendor branches
2786 Merge commits are commits based on multiple parent commits.
2787 The tip commit of the work tree's current branch, which must be set with
2791 operation, will be used as the first parent.
2792 The tip commit of the specified
2794 will be used as the second parent.
2796 No ancestral relationship between the two branches is required.
2797 If the two branches have already been merged previously, only new changes
2800 It is not possible to create merge commits with more than two parents.
2801 If more than one branch needs to be merged, then multiple merge commits
2802 with two parents each can be created in sequence.
2804 While merging changes found on the
2806 into the work tree, show the status of each affected file,
2807 using the following status codes:
2808 .Bl -column YXZ description
2809 .It G Ta file was merged
2810 .It C Ta file was merged and conflicts occurred during merge
2811 .It ! Ta changes destined for a missing file were not merged
2812 .It D Ta file was deleted
2813 .It d Ta file's deletion was prevented by local modifications
2814 .It A Ta new file was added
2815 .It \(a~ Ta changes destined for a non-regular file were not merged
2816 .It ? Ta changes destined for an unversioned file were not merged
2819 If merge conflicts occur, the merge operation is interrupted and conflicts
2820 must be resolved before the merge operation can continue.
2821 If any files with destined changes are found to be missing or unversioned,
2822 or if files could not be deleted due to differences in deleted content,
2823 the merge operation will be interrupted to prevent potentially incomplete
2824 changes from being committed to the repository without user intervention.
2825 The work tree may be modified as desired and the merge can be continued
2826 once the changes present in the work tree are considered complete.
2827 Alternatively, the merge operation may be aborted which will leave
2828 the work tree's current branch unmodified.
2830 If a merge conflict is resolved in a way which renders all merged
2831 changes into no-op changes, the merge operation cannot continue
2832 and must be aborted.
2835 will refuse to run if certain preconditions are not met.
2838 is based on the work tree's current branch, then no merge commit can
2841 may be used to integrate the
2844 If the work tree is not yet fully updated to the tip commit of its
2845 branch, then the work tree must first be updated with
2847 If the work tree contains multiple base commits, it must first be updated
2848 to a single base commit with
2850 If changes have been staged with
2852 these changes must first be committed with
2856 If the work tree contains local changes, these changes must first be
2863 contains changes to files outside of the work tree's path prefix,
2864 the work tree cannot be used to merge this branch.
2874 commands will refuse to run while a merge operation is in progress.
2875 Other commands which manipulate the work tree may be used for
2876 conflict resolution purposes.
2883 Abort an interrupted merge operation.
2884 If this option is used, no other command-line arguments are allowed.
2886 Allow a merge operation to continue with files in conflicted status.
2887 This option should generally be avoided, and can only be used with the
2891 Continue an interrupted merge operation.
2892 If this option is used, no other command-line arguments are allowed.
2894 Merge changes into the work tree as usual but do not create a merge
2896 The merge result can be adjusted as desired before a merge commit is
2899 Alternatively, the merge may be aborted with
2906 .Op Fl F Ar response-script
2910 Stage local changes for inclusion in the next commit.
2913 is specified, stage all changes in the work tree.
2914 Otherwise, stage changes at or within the specified paths.
2915 Paths may be staged if they are added, modified, or deleted according to
2918 Show the status of each affected file, using the following status codes:
2919 .Bl -column YXZ description
2920 .It A Ta file addition has been staged
2921 .It M Ta file modification has been staged
2922 .It D Ta file deletion has been staged
2925 Staged file contents are saved in newly created blob objects in the repository.
2926 These blobs will be referred to by tree objects once staged changes have been
2929 Staged changes affect the behaviour of
2934 While paths with staged changes exist, the
2936 command will refuse to commit any paths which do not have staged changes.
2937 Local changes created on top of staged changes can only be committed if
2938 the path is staged again, or if the staged changes are committed first.
2941 command will show both local changes and staged changes.
2944 command is able to display local changes relative to staged changes,
2945 and to display staged changes relative to the repository.
2948 command cannot revert staged changes but may be used to revert
2949 local changes created on top of staged changes.
2955 .It Fl F Ar response-script
2963 responses line-by-line from the specified
2965 file instead of prompting interactively.
2967 Instead of staging new changes, list paths which are already staged,
2968 along with the IDs of staged blob objects and stage status codes.
2969 If paths were provided on the command line, show the staged paths
2970 among the specified paths.
2971 Otherwise, show all staged paths.
2973 Instead of staging the entire content of a changed file, interactively
2974 select or reject changes for staging based on
2978 (reject change), and
2980 (quit staging this file) responses.
2981 If a file is in modified status, individual patches derived from the
2982 modified file content can be staged.
2983 Files in added or deleted status may only be staged or rejected in
2986 Allow staging of symbolic links which point outside of the path space
2987 that is under version control.
2990 will reject such symbolic links due to safety concerns.
2993 may decide to represent such a symbolic link as a regular file which contains
2994 the link's target path, rather than creating an actual symbolic link which
2995 points outside of the work tree.
2996 Use of this option is discouraged because external mechanisms such as
2998 are better suited for managing symbolic links to paths not under
3003 will refuse to run if certain preconditions are not met.
3004 If a file contains merge conflicts, these conflicts must be resolved first.
3005 If a file is found to be out of date relative to the head commit on the
3006 work tree's current branch, the file must be updated with
3008 before it can be staged (however, this does not prevent the file from
3009 becoming out-of-date at some point after having been staged).
3016 commands will refuse to run while staged changes exist.
3017 If staged changes cannot be committed because a staged path
3018 is out of date, the path must be unstaged with
3020 before it can be updated with
3022 and may then be staged again if necessary.
3027 .Op Fl F Ar response-script
3031 Merge staged changes back into the work tree and put affected paths
3032 back into non-staged status.
3035 is specified, unstage all staged changes across the entire work tree.
3036 Otherwise, unstage changes at or within the specified paths.
3038 Show the status of each affected file, using the following status codes:
3039 .Bl -column YXZ description
3040 .It G Ta file was unstaged
3041 .It C Ta file was unstaged and conflicts occurred during merge
3042 .It ! Ta changes destined for a missing file were not merged
3043 .It D Ta file was staged as deleted and still is deleted
3044 .It d Ta file's deletion was prevented by local modifications
3045 .It \(a~ Ta changes destined for a non-regular file were not merged
3052 .It Fl F Ar response-script
3060 responses line-by-line from the specified
3062 file instead of prompting interactively.
3064 Instead of unstaging the entire content of a changed file, interactively
3065 select or reject changes for unstaging based on
3069 (keep change staged), and
3071 (quit unstaging this file) responses.
3072 If a file is staged in modified status, individual patches derived from the
3073 staged file content can be unstaged.
3074 Files staged in added or deleted status may only be unstaged in their entirety.
3080 .Op Fl r Ar repository-path
3083 Parse and print contents of objects to standard output in a line-based
3085 Content of commit, tree, and tag objects is printed in a way similar
3086 to the actual content stored in such objects.
3087 Blob object contents are printed as they would appear in files on disk.
3089 Attempt to interpret each argument as a reference, a tag name, or
3090 an object ID SHA1 hash.
3091 References will be resolved to an object ID.
3092 Tag names will resolved to a tag object.
3093 An abbreviated hash argument will be expanded to a full SHA1 hash
3094 automatically, provided the abbreviation is unique.
3096 If none of the above interpretations produce a valid result, or if the
3098 option is used, attempt to interpret the argument as a path which will
3099 be resolved to the ID of an object found at this path in the repository.
3106 Look up paths in the specified
3108 If this option is not used, paths are looked up in the commit resolved
3109 via the repository's HEAD reference.
3110 The expected argument is a commit ID SHA1 hash or an existing reference
3111 or tag name which will be resolved to a commit ID.
3112 An abbreviated hash argument will be expanded to a full SHA1 hash
3113 automatically, provided the abbreviation is unique.
3115 Interpret all arguments as paths only.
3116 This option can be used to resolve ambiguity in cases where paths
3117 look like tag names, reference names, or object IDs.
3118 .It Fl r Ar repository-path
3119 Use the repository at the specified path.
3120 If not specified, assume the repository is located at or above the current
3122 If this directory is a
3124 work tree, use the repository path associated with this work tree.
3126 .It Cm info Op Ar path ...
3127 Display meta-data stored in a work tree.
3132 The work tree to use is resolved implicitly by walking upwards from the
3133 current working directory.
3137 arguments are specified, show additional per-file information for tracked
3138 files located at or within these paths.
3141 argument corresponds to the work tree's root directory, display information
3142 for all tracked files.
3145 .Bl -tag -width GOT_IGNORE_GITCONFIG
3147 The author's name and email address, such as
3148 .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
3158 may fail to parse commits without an email address in author data,
3162 environment variables with a missing email address.
3164 .Ev GOT_AUTHOR will be overridden by configuration settings in
3170 configuration settings in the repository's
3177 configuration settings contained in Git's global
3179 configuration file will only be used if neither
3183 environment variable provide author information.
3184 .It Ev GOT_IGNORE_GITCONFIG
3185 If this variable is set then any remote repository definitions or author
3186 information found in Git configuration files will be ignored.
3187 .It Ev GOT_LOG_DEFAULT_LIMIT
3188 The default limit on the number of commits traversed by
3190 If set to zero, the limit is unbounded.
3191 This variable will be silently ignored if it is set to a non-numeric value.
3192 .It Ev VISUAL , EDITOR
3193 The editor spawned by
3201 text editor will be spawned in order to give
3203 the attention it deserves.
3206 .Bl -tag -width packed-refs -compact
3208 Repository-wide configuration settings for
3212 configuration file located in the root directory of a Git repository
3213 supersedes any relevant settings in Git's
3217 .It Pa .got/got.conf
3218 Worktree-specific configuration settings for
3222 configuration file in the
3224 meta-data directory of a work tree supersedes any relevant settings in
3227 configuration file and Git's
3234 Enable tab-completion of
3239 .Dl $ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
3241 Clone an existing Git repository for use with
3245 .Dl $ got clone ssh://git@github.com/openbsd/src.git
3247 Use of HTTP URLs currently requires
3251 .Dl $ git clone --bare https://github.com/openbsd/src.git
3253 Alternatively, for quick and dirty local testing of
3255 a new Git repository could be created and populated with files,
3256 e.g. from a temporary CVS checkout located at
3259 .Dl $ gotadmin init /var/git/src.git
3260 .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
3262 Check out a work tree from the Git repository to /usr/src:
3264 .Dl $ got checkout /var/git/src.git /usr/src
3266 View local changes in a work tree directory:
3268 .Dl $ got diff | less
3270 In a work tree, display files in a potentially problematic state:
3272 .Dl $ got status -s 'C!~?'
3274 Interactively revert selected local changes in a work tree directory:
3276 .Dl $ got revert -p -R\ .
3278 In a work tree or a git repository directory, list all branch references:
3282 As above, but list the most recently modified branches only:
3284 .Dl $ got branch -lt | head
3286 In a work tree or a git repository directory, create a new branch called
3287 .Dq unified-buffer-cache
3288 which is forked off the
3292 .Dl $ got branch -c master unified-buffer-cache
3294 Switch an existing work tree to the branch
3295 .Dq unified-buffer-cache .
3296 Local changes in the work tree will be preserved and merged if necessary:
3298 .Dl $ got update -b unified-buffer-cache
3300 Create a new commit from local changes in a work tree directory.
3301 This new commit will become the head commit of the work tree's current branch:
3305 In a work tree or a git repository directory, view changes committed in
3306 the 3 most recent commits to the work tree's branch, or the branch resolved
3307 via the repository's HEAD reference, respectively:
3309 .Dl $ got log -p -l 3
3311 As above, but display changes in the order in which
3313 could apply them in sequence:
3315 .Dl $ got log -p -l 3 -R
3317 In a work tree or a git repository directory, log the history of a subdirectory:
3319 .Dl $ got log sys/uvm
3321 While operating inside a work tree, paths are specified relative to the current
3322 working directory, so this command will log the subdirectory
3325 .Dl $ cd sys/uvm && got log\ .
3327 And this command has the same effect:
3329 .Dl $ cd sys/dev/usb && got log ../../uvm
3331 And this command displays work tree meta-data about all tracked files:
3334 .Dl $ got info\ . | less
3336 Add new files and remove obsolete files in a work tree directory:
3338 .Dl $ got add sys/uvm/uvm_ubc.c
3339 .Dl $ got remove sys/uvm/uvm_vnode.c
3341 Create a new commit from local changes in a work tree directory
3342 with a pre-defined log message.
3344 .Dl $ got commit -m 'unify the buffer cache'
3346 Alternatively, create a new commit from local changes in a work tree
3347 directory with a log message that has been prepared in the file
3350 .Dl $ got commit -F /tmp/msg
3352 Update any work tree checked out from the
3353 .Dq unified-buffer-cache
3354 branch to the latest commit on this branch:
3358 Roll file content on the unified-buffer-cache branch back by one commit,
3359 and then fetch the rolled-back change into the work tree as a local change
3360 to be amended and perhaps committed again:
3362 .Dl $ got backout unified-buffer-cache
3363 .Dl $ got commit -m 'roll back previous'
3364 .Dl $ # now back out the previous backout :-)
3365 .Dl $ got backout unified-buffer-cache
3367 Fetch new changes on the remote repository's
3369 branch, making them visible on the local repository's
3376 In a repository created with a HTTP URL and
3377 .Cm git clone --bare
3380 command must be used instead:
3382 .Dl $ cd /var/git/src.git
3383 .Dl $ git fetch origin master:refs/remotes/origin/master
3387 branch to merge the new changes that are now visible on the
3392 .Dl $ got update -b origin/master
3393 .Dl $ got rebase master
3396 .Dq unified-buffer-cache
3397 branch on top of the new head commit of the
3401 .Dl $ got update -b master
3402 .Dl $ got rebase unified-buffer-cache
3404 Create a patch from all changes on the unified-buffer-cache branch.
3405 The patch can be mailed out for review and applied to
3409 .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
3411 Edit the entire commit history of the
3412 .Dq unified-buffer-cache
3415 .Dl $ got update -b unified-buffer-cache
3416 .Dl $ got update -c master
3419 Before working against existing branches in a repository cloned with
3420 .Cm git clone --bare
3425 must be configured to map all references in the remote repository
3428 namespace of the local repository.
3429 This can be achieved by setting Git's
3430 .Pa remote.origin.fetch
3431 configuration variable to the value
3432 .Dq +refs/heads/*:refs/remotes/origin/*
3437 .Dl $ cd /var/git/repo
3438 .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
3442 option must be disabled:
3444 .Dl $ cd /var/git/repo
3445 .Dl $ git config remote.origin.mirror false
3447 Alternatively, the following
3449 configuration item can be added manually to the Git repository's
3453 .Dl [remote \&"origin\&"]
3455 .Dl fetch = +refs/heads/*:refs/remotes/origin/*
3458 This configuration leaves the local repository's
3460 namespace free for use by local branches checked out with
3462 and, if needed, created with
3465 .Dq refs/remotes/origin
3466 namespace can now be updated with incoming changes from the remote
3471 without extra command line arguments.
3472 Newly fetched changes can be examined with
3475 Display changes on the remote repository's version of the
3477 branch, as of the last time
3481 .Dl $ got log -c origin/master | less
3483 As shown here, most commands accept abbreviated reference names such as
3486 .Dq refs/remotes/origin/master .
3487 The latter is only needed in case of ambiguity.
3490 must be used to merge changes which are visible on the
3495 This will also merge local changes, if any, with the incoming changes:
3497 .Dl $ got update -b origin/master
3498 .Dl $ got rebase master
3500 In order to make changes committed to the
3501 .Dq unified-buffer-cache
3505 .Dq unified-buffer-cache
3506 branch must first be rebased onto the
3510 .Dl $ got update -b master
3511 .Dl $ got rebase unified-buffer-cache
3514 .Dq unified-buffer-cache
3515 branch can now be made visible on the
3519 Because the rebase operation switched the work tree to the
3520 .Dq unified-buffer-cache
3521 branch, the work tree must be switched back to the
3525 .Dl $ got update -b master
3526 .Dl $ got integrate unified-buffer-cache
3530 branch, log messages for local changes can now be amended with
3532 by other developers and any other important new information:
3534 .Dl $ got update -c origin/master
3535 .Dl $ got histedit -m
3537 If the remote repository offers write access, local changes on the
3539 branch can be sent to the remote repository with
3543 can be run without further arguments.
3544 The arguments shown here match defaults, provided the work tree's
3545 current branch is the
3549 .Dl $ got send -b master origin
3551 If the remote repository requires the HTTPS protocol, the
3553 command must be used instead:
3555 .Dl $ cd /var/git/src.git
3556 .Dl $ git push origin master
3558 When making contributions to projects which use the
3560 workflow, SSH protocol repository access needs to be set up first.
3561 Once an account has been created on a Git hosting site it should
3562 be possible to upload a public SSH key for repository access
3567 workflow will usually involve two remote repositories.
3568 In the real-life example below, the
3570 repository was forked from the
3572 repository by using the Git hosting site's web interface.
3575 file in the local repository describes both remote repositories:
3576 .Bd -literal -offset indent
3577 # Jelmers's repository, which accepts pull requests
3579 server git@github.com
3581 repository "/jelmer/dulwich"
3585 # Stefan's fork, used as the default remote repository
3587 server git@github.com
3589 repository "/stspdotname/dulwich"
3594 With this configuration, Stefan can create commits on
3595 .Dq refs/heads/master
3596 and send them to the
3598 repository by running:
3600 .Dl $ got send -b master origin
3602 The changes can now be proposed to Jelmer by opening a pull request
3603 via the Git hosting site's web interface.
3604 If Jelmer requests further changes to be made, additional commits
3605 can be created on the
3607 branch and be added to the pull request by running
3611 If Jelmer prefers additional commits to be
3613 then the following commands can be used to achieve this:
3615 .Dl $ got update -b master
3616 .Dl $ got update -c origin/master
3617 .Dl $ got histedit -f
3618 .Dl $ got send -f -b master origin
3620 Once Jelmer has accepted the pull request, Stefan can fetch the
3621 merged changes, and possibly several other new changes, by running:
3623 .Dl $ got fetch upstream
3625 The merged changes will now be visible under the reference
3626 .Dq refs/remotes/upstream/master .
3629 branch can now be rebased on top of the latest changes
3632 .Dl $ got update -b upstream/master
3633 .Dl $ got rebase master
3635 As a final step, the forked repository's copy of the master branch needs
3636 to be kept in sync by sending the new changes there:
3638 .Dl $ got send -f -b master origin
3640 If multiple pull requests need to be managed in parallel, a separate branch
3641 must be created for each pull request with
3643 Each such branch can then be used as above, in place of
3644 .Dq refs/heads/master .
3645 Changes for any accepted pull requests will still appear under
3646 .Dq refs/remotes/upstream/master,
3647 regardless of which branch was used in the forked repository to
3648 create a pull request.
3652 .Xr git-repository 5 ,
3653 .Xr got-worktree 5 ,
3657 .An Anthony J. Bentley Aq Mt bentley@openbsd.org
3658 .An Christian Weisgerber Aq Mt naddy@openbsd.org
3659 .An Hiltjo Posthuma Aq Mt hiltjo@codemadness.org
3660 .An Josh Rickmar Aq Mt jrick@zettaport.com
3661 .An Joshua Stein Aq Mt jcs@openbsd.org
3662 .An Klemens Nanni Aq Mt kn@openbsd.org
3663 .An Martin Pieuchot Aq Mt mpi@openbsd.org
3664 .An Neels Hofmeyr Aq Mt neels@hofmeyr.de
3665 .An Omar Polo Aq Mt op@openbsd.org
3666 .An Ori Bernstein Aq Mt ori@openbsd.org
3667 .An Sebastien Marie Aq Mt semarie@openbsd.org
3668 .An Stefan Sperling Aq Mt stsp@openbsd.org
3669 .An Steven McDonald Aq Mt steven@steven-mcdonald.id.au
3670 .An Theo Buehler Aq Mt tb@openbsd.org
3671 .An Thomas Adam Aq Mt thomas@xteddy.org
3672 .An Tracey Emery Aq Mt tracey@traceyemery.net
3673 .An Yang Zhong Aq Mt yzhong@freebsdfoundation.org
3680 were derived from code under copyright by:
3682 .An Caldera International
3683 .An Daniel Hartmeier
3688 .An Jean-Francois Brousseau
3694 .An Niklas Hallqvist
3699 .An Xavier Santolaria
3702 contains code contributed to the public domain by
3703 .An Austin Appleby .
3706 is a work-in-progress and some features remain to be implemented.
3708 At present, the user has to fall back on
3710 to perform some tasks.
3714 Reading from remote repositories over HTTP or HTTPS protocols requires
3719 Writing to remote repositories over HTTP or HTTPS protocols requires
3722 The creation of merge commits with more than two parent commits requires
3725 In situations where files or directories were moved around
3727 will not automatically merge changes to new locations and
3729 will usually produce better results.
