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.
791 Ignore patterns which end with a slash,
793 will only match directories.
798 supports consecutive asterisks,
800 which will match an arbitrary amount of directories.
804 only supports a single ignore pattern per line.
808 does not support negated ignore patterns prefixed with
810 and gives no special significance to the location of path component separators,
819 .Op Fl r Ar repository-path
820 .Op Fl S Ar search-pattern
824 Display history of a repository.
827 is specified, show only commits which modified this path.
828 If invoked in a work tree, the
830 is interpreted relative to the current working directory,
831 and the work tree's path prefix is implicitly prepended.
832 Otherwise, the path is interpreted relative to the repository root.
839 Display individual commits which were merged into the current branch
843 shows the linear history of the current branch only.
845 Set the number of context lines shown in diffs with
847 By default, 3 lines of context are shown.
849 Start traversing history at the specified
851 The expected argument is a commit ID SHA1 hash or an existing reference
852 or tag name which will be resolved to a commit ID.
853 An abbreviated hash argument will be expanded to a full SHA1 hash
854 automatically, provided the abbreviation is unique.
855 If this option is not specified, default to the work tree's current branch
856 if invoked in a work tree, or to the repository's HEAD reference.
858 Display diffstat of changes introduced in each commit.
859 Cannot be used with the
863 Limit history traversal to a given number of commits.
864 If this option is not specified, a default limit value of zero is used,
865 which is treated as an unbounded limit.
867 .Ev GOT_LOG_DEFAULT_LIMIT
868 environment variable may be set to change this default value.
870 Display the list of file paths changed in each commit, using the following
872 .Bl -column YXZ description
873 .It M Ta modified file
874 .It D Ta file was deleted
875 .It A Ta new file was added
876 .It m Ta modified file modes (executable bit only)
879 Cannot be used with the
883 Display the patch of modifications made in each commit.
886 is specified, only show the patch of modifications at or within this path.
887 Cannot be used with the
891 Determine a set of commits to display as usual, but display these commits
893 .It Fl r Ar repository-path
894 Use the repository at the specified path.
895 If not specified, assume the repository is located at or above the current
897 If this directory is a
899 work tree, use the repository path associated with this work tree.
900 .It Fl S Ar search-pattern
901 If specified, show only commits with a log message, author name,
902 committer name, or ID SHA1 hash matched by the extended regular
905 Lines in committed patches will be matched if
908 File paths changed by a commit will be matched if
911 Regular expression syntax is documented in
914 Display a short one-line summary of each commit, instead of the default
916 Cannot be used together with the
922 Stop traversing commit history immediately after the specified
925 This option has no effect if the specified
935 .Op Fl r Ar repository-path
936 .Op Ar object1 Ar object2 | Ar path ...
939 When invoked within a work tree without any arguments, display all
940 local changes in the work tree.
943 arguments are specified, only show changes within the specified paths.
945 If two arguments are provided, treat each argument as a reference, a tag
946 name, or an object ID SHA1 hash, and display differences between the
947 corresponding objects.
948 Both objects must be of the same type (blobs, trees, or commits).
949 An abbreviated hash argument will be expanded to a full SHA1 hash
950 automatically, provided the abbreviation is unique.
951 If none of these interpretations produce a valid result or if the
956 is running in a work tree, attempt to interpret the two arguments as paths.
963 Treat file contents as ASCII text even if binary data is detected.
965 Set the number of context lines shown in the diff.
966 By default, 3 lines of context are shown.
968 Show differences between commits in the repository.
969 This option may be used up to two times.
970 When used only once, show differences between the specified
972 and its first parent commit.
973 When used twice, show differences between the two specified commits.
975 The expected argument is a commit ID SHA1 hash or an existing reference
976 or tag name which will be resolved to a commit ID.
977 An abbreviated hash argument will be expanded to a full SHA1 hash
978 automatically, provided the abbreviation is unique.
982 option is used, all non-option arguments will be interpreted as paths.
985 arguments are provided, only show differences for the specified paths.
987 Cannot be used together with the
991 Display diffstat of changes before the actual diff by annotating each file path
992 or blob hash being diffed with the total number of lines added and removed.
993 A summary line will display the total number of changes across all files.
995 Interpret all arguments as paths only.
996 This option can be used to resolve ambiguity in cases where paths
997 look like tag names, reference names, or object IDs.
998 This option is only valid when
1000 is invoked in a work tree.
1001 .It Fl r Ar repository-path
1002 Use the repository at the specified path.
1003 If not specified, assume the repository is located at or above the current
1005 If this directory is a
1007 work tree, use the repository path associated with this work tree.
1009 Show changes staged with
1011 instead of showing local changes in the work tree.
1012 This option is only valid when
1014 is invoked in a work tree.
1016 Ignore whitespace-only changes.
1022 .Op Fl r Ar repository-path
1026 Display line-by-line history of a file at the specified path.
1033 Start traversing history at the specified
1035 The expected argument is a commit ID SHA1 hash or an existing reference
1036 or tag name which will be resolved to a commit ID.
1037 An abbreviated hash argument will be expanded to a full SHA1 hash
1038 automatically, provided the abbreviation is unique.
1039 .It Fl r Ar repository-path
1040 Use the repository at the specified path.
1041 If not specified, assume the repository is located at or above the current
1043 If this directory is a
1045 work tree, use the repository path associated with this work tree.
1052 .Op Fl r Ar repository-path
1056 Display a listing of files and directories at the specified
1057 directory path in the repository.
1058 Entries shown in this listing may carry one of the following trailing
1060 .Bl -column YXZ description
1061 .It @ Ta entry is a symbolic link
1062 .It / Ta entry is a directory
1063 .It * Ta entry is an executable file
1064 .It $ Ta entry is a Git submodule
1067 Symbolic link entries are also annotated with the target path of the link.
1071 is specified, list the repository path corresponding to the current
1072 directory of the work tree, or the root directory of the repository
1073 if there is no work tree.
1080 List files and directories as they appear in the specified
1082 The expected argument is a commit ID SHA1 hash or an existing reference
1083 or tag name which will be resolved to a commit ID.
1084 An abbreviated hash argument will be expanded to a full SHA1 hash
1085 automatically, provided the abbreviation is unique.
1087 Show object IDs of files (blob objects) and directories (tree objects).
1089 Recurse into sub-directories in the repository.
1090 .It Fl r Ar repository-path
1091 Use the repository at the specified path.
1092 If not specified, assume the repository is located at or above the current
1094 If this directory is a
1096 work tree, use the repository path associated with this work tree.
1102 .Op Fl r Ar repository-path
1103 .Op Fl s Ar reference
1106 Manage references in a repository.
1108 References may be listed, created, deleted, and changed.
1109 When creating, deleting, or changing a reference the specified
1111 must be an absolute reference name, i.e. it must begin with
1119 Create a reference or change an existing reference.
1120 The reference with the specified
1122 will point at the specified
1126 argument is a ID SHA1 hash or an existing reference or tag name which will
1127 be resolved to the ID of a corresponding commit, tree, tag, or blob object.
1128 Cannot be used together with any other options except
1131 Delete the reference with the specified
1133 from the repository.
1134 Any commit, tree, tag, and blob objects belonging to deleted references
1135 remain in the repository and may be removed separately with
1136 Git's garbage collector or
1137 .Cm gotadmin cleanup .
1138 Cannot be used together with any other options except
1141 List references in the repository.
1144 is specified, list all existing references in the repository.
1147 is a reference namespace, list all references in this namespace.
1148 Otherwise, show only the reference with the given
1150 Cannot be used together with any other options except
1154 .It Fl r Ar repository-path
1155 Use the repository at the specified path.
1156 If not specified, assume the repository is located at or above the current
1158 If this directory is a
1160 work tree, use the repository path associated with this work tree.
1161 .It Fl s Ar reference
1162 Create a symbolic reference, or change an existing symbolic reference.
1163 The symbolic reference with the specified
1165 will point at the specified
1167 which must already exist in the repository.
1168 Care should be taken not to create loops between references when
1169 this option is used.
1170 Cannot be used together with any other options except
1173 Sort listed references by modification time (most recently modified first)
1174 instead of sorting by lexicographical order.
1175 Use of this option requires the
1177 option to be used as well.
1185 .Op Fl r Ar repository-path
1189 Create, list, or delete branches.
1191 Local branches are managed via references which live in the
1193 reference namespace.
1196 command creates references in this namespace only.
1198 When deleting branches, the specified
1202 reference namespace first.
1203 If no corresponding branch is found, the
1205 namespace will be searched next.
1207 If invoked in a work tree without any arguments, print the name of the
1208 work tree's current branch.
1212 argument is passed, attempt to create a branch reference with the given name.
1213 By default the new branch reference will point at the latest commit on the
1214 work tree's current branch if invoked in a work tree, and otherwise to a commit
1215 resolved via the repository's HEAD reference.
1217 If invoked in a work tree, once the branch was created successfully
1218 switch the work tree's head reference to the newly created branch and
1219 update files across the entire work tree, just like
1220 .Cm got update -b Ar name
1222 Show the status of each affected file, using the following status codes:
1223 .Bl -column YXZ description
1224 .It U Ta file was updated and contained no local changes
1225 .It G Ta file was updated and local changes were merged cleanly
1226 .It C Ta file was updated and conflicts occurred during merge
1227 .It D Ta file was deleted
1228 .It A Ta new file was added
1229 .It \(a~ Ta versioned file is obstructed by a non-regular file
1230 .It ! Ta a missing versioned file was restored
1238 Make a newly created branch reference point at the specified
1242 argument is a commit ID SHA1 hash or an existing reference
1243 or tag name which will be resolved to a commit ID.
1245 Delete the branch with the specified
1251 reference namespace.
1253 Only the branch reference is deleted.
1254 Any commit, tree, and blob objects belonging to the branch
1255 remain in the repository and may be removed separately with
1256 Git's garbage collector or
1257 .Cm gotadmin cleanup .
1259 List all existing branches in the repository, including copies of remote
1260 repositories' branches in the
1262 reference namespace.
1264 If invoked in a work tree, the work tree's current branch is shown
1265 with one the following annotations:
1266 .Bl -column YXZ description
1267 .It * Ta work tree's base commit matches the branch tip
1268 .It \(a~ Ta work tree's base commit is out-of-date
1271 Do not switch and update the work tree after creating a new branch.
1272 .It Fl r Ar repository-path
1273 Use the repository at the specified path.
1274 If not specified, assume the repository is located at or above the current
1276 If this directory is a
1278 work tree, use the repository path associated with this work tree.
1280 Sort listed branches by modification time (most recently modified first)
1281 instead of sorting by lexicographical order.
1284 reference namespace are listed before branches in
1287 Use of this option requires the
1289 option to be used as well.
1296 .Op Fl r Ar repository-path
1297 .Op Fl s Ar signer-id
1300 Manage tags in a repository.
1302 Tags are managed via references which live in the
1304 reference namespace.
1307 command operates on references in this namespace only.
1308 References in this namespace point at tag objects which contain a pointer
1309 to another object, a tag message, as well as author and timestamp information.
1311 Attempt to create a tag with the given
1313 and make this tag point at the given
1315 If no commit is specified, default to the latest commit on the work tree's
1316 current branch if invoked in a work tree, and to a commit resolved via
1317 the repository's HEAD reference otherwise.
1324 Make the newly created tag reference point at the specified
1328 argument is a commit ID SHA1 hash or an existing reference or tag name which
1329 will be resolved to a commit ID.
1330 An abbreviated hash argument will be expanded to a full SHA1 hash
1331 automatically, provided the abbreviation is unique.
1333 List all existing tags in the repository instead of creating a new tag.
1336 argument is passed, show only the tag with the given
1339 Use the specified tag message when creating the new tag.
1344 opens a temporary file in an editor where a tag message can be written.
1345 .It Fl r Ar repository-path
1346 Use the repository at the specified path.
1347 If not specified, assume the repository is located at or above the current
1349 If this directory is a
1351 work tree, use the repository path associated with this work tree.
1352 .It Fl s Ar signer-id
1353 While creating a new tag, sign this tag with the identity given in
1356 For SSH-based signatures,
1358 is the path to a file which may refer to either a private SSH key,
1359 or a public SSH key with the private half available via
1362 will sign the tag object by invoking
1366 command, using the signature namespace
1368 for compatibility with
1371 Verify tag object signatures.
1374 is specified, show and verify the tag object with the provided name.
1375 Otherwise, list all tag objects and verify signatures where present.
1378 verifies SSH-based signatures by invoking
1381 .Fl Y Cm verify Fl f Ar allowed_signers .
1386 otherwise verification is impossible.
1389 During SSH signature creation and verification this option will be passed to
1391 Multiple -v options increase the verbosity.
1397 command will not delete tags or change existing tags.
1398 If a tag must be deleted, the
1400 command may be used to delete a tag's reference.
1401 This should only be done if the tag has not already been copied to
1408 Schedule unversioned files in a work tree for addition to the
1409 repository in the next commit.
1410 By default, files which match a
1412 ignore pattern will not be added.
1419 Add files even if they match a
1423 Permit recursion into directories.
1424 If this option is not specified,
1426 will refuse to run if a specified
1434 .Op Fl s Ar status-codes
1438 Remove versioned files from a work tree and schedule them for deletion
1439 from the repository in the next commit.
1446 Perform the operation even if a file contains local modifications,
1447 and do not raise an error if a specified
1449 does not exist on disk.
1451 Keep affected files on disk.
1453 Permit recursion into directories.
1454 If this option is not specified,
1456 will refuse to run if a specified
1459 .It Fl s Ar status-codes
1460 Only delete files with a modification status matching one of the
1461 single-character status codes contained in the
1464 The following status codes may be specified:
1465 .Bl -column YXZ description
1466 .It M Ta modified file (this implies the
1469 .It ! Ta versioned file expected on disk but missing
1477 .Op Fl p Ar strip-count
1483 to files in a work tree.
1484 Files added or removed by a patch will be scheduled for addition or removal in
1487 The patch must be in the unified diff format as produced by
1494 diff when invoked with their
1499 argument is provided, read unified diff data from standard input instead.
1503 contains multiple patches, then attempt to apply each of them in sequence.
1505 Show the status of each affected file, using the following status codes:
1506 .Bl -column XYZ description
1507 .It M Ta file was modified
1508 .It G Ta file was merged using a merge-base found in the repository
1509 .It C Ta file was merged and conflicts occurred during merge
1510 .It D Ta file was deleted
1511 .It A Ta file was added
1512 .It # Ta failed to patch the file
1515 If a change does not match at its exact line number, attempt to
1516 apply it somewhere else in the file if a good spot can be found.
1517 Otherwise, the patch will fail to apply.
1521 will refuse to apply a patch if certain preconditions are not met.
1522 Files to be deleted must already be under version control, and must
1523 not have been scheduled for deletion already.
1524 Files to be added must not yet be under version control and must not
1525 already be present on disk.
1526 Files to be modified must already be under version control and may not
1527 contain conflict markers.
1529 If an error occurs, the
1531 operation will be aborted.
1532 Any changes made to the work tree up to this point will be left behind.
1533 Such changes can be viewed with
1535 and can be reverted with
1544 Attempt to locate files within the specified
1546 for use as a merge-base for 3-way merges.
1547 Ideally, the specified
1549 should contain versions of files which the changes contained in the
1552 Files will be located by path, relative to the repository root.
1555 option is used then leading path components will be stripped
1556 before paths are looked up in the repository.
1560 option is not used then
1562 will attempt to locate merge-bases via object IDs found in
1564 meta-data, such as produced by
1570 option is only recommended in the absence of such meta-data.
1572 In case no merge-base is available for a file, changes will be applied
1573 without doing a 3-way merge.
1574 Changes which do not apply cleanly may then be rejected entirely, rather
1575 than producing merge conflicts in the patched target file.
1577 Do not make any modifications to the work tree.
1578 This can be used to check whether a patch would apply without issues.
1581 contains diffs that affect the same file multiple times, the results
1582 displayed may be incorrect.
1583 .It Fl p Ar strip-count
1584 Specify the number of leading path components to strip from paths
1593 path prefixes generated by
1595 will be recognized and stripped automatically.
1597 Reverse the patch before applying it.
1603 .Op Fl F Ar response-script
1607 Revert any local changes in files at the specified paths in a work tree.
1608 File contents will be overwritten with those contained in the
1609 work tree's base commit.
1610 There is no way to bring discarded changes back after
1613 If a file was added with
1615 it will become an unversioned file again.
1616 If a file was deleted with
1618 it will be restored.
1624 .It Fl F Ar response-script
1632 responses line-by-line from the specified
1634 file instead of prompting interactively.
1636 Instead of reverting all changes in files, interactively select or reject
1637 changes to revert based on
1643 (quit reverting this file) responses.
1644 If a file is in modified status, individual patches derived from the
1645 modified file content can be reverted.
1646 Files in added or deleted status may only be reverted in their entirety.
1648 Permit recursion into directories.
1649 If this option is not specified,
1651 will refuse to run if a specified
1665 Create a new commit in the repository from changes in a work tree
1666 and use this commit as the new base commit for the work tree.
1669 is specified, commit all changes in the work tree.
1670 Otherwise, commit changes at or within the specified paths.
1672 If changes have been explicitly staged for commit with
1674 only commit staged changes and reject any specified paths which
1675 have not been staged.
1678 opens a temporary file in an editor where a log message can be written
1686 options are used together.
1688 Show the status of each affected file, using the following status codes:
1689 .Bl -column YXZ description
1690 .It M Ta modified file
1691 .It D Ta file was deleted
1692 .It A Ta new file was added
1693 .It m Ta modified file modes (executable bit only)
1696 Files which are not part of the new commit will retain their previously
1697 recorded base commit.
1700 commands may refuse to run while the work tree contains files from
1701 multiple base commits.
1702 The base commit of such a work tree can be made consistent by running
1704 across the entire work tree.
1708 command requires the
1710 environment variable to be set,
1711 unless an author has been configured in
1717 configuration settings can be
1718 obtained from the repository's
1720 file or from Git's global
1729 Set author information in the newly created commit to
1731 This is useful when committing changes on behalf of someone else.
1734 argument must use the same format as the
1736 environment variable.
1738 In addition to storing author information, the newly created commit
1741 information which is obtained, as usual, from the
1743 environment variable, or
1745 or Git configuration settings.
1747 Allow committing files in conflicted status.
1749 Committing files with conflict markers should generally be avoided.
1750 Cases where conflict markers must be stored in the repository for
1751 some legitimate reason should be very rare.
1752 There are usually ways to avoid storing conflict markers verbatim by
1753 applying appropriate programming tricks.
1755 Use the prepared log message stored in the file found at
1757 when creating the new commit.
1759 opens a temporary file in an editor where the prepared log message can be
1760 reviewed and edited further if needed.
1761 Cannot be used together with the
1765 Use the specified log message when creating the new commit.
1766 Cannot be used together with the
1770 This option prevents
1772 from opening the commit message in an editor.
1773 It has no effect unless it is used together with the
1775 option and is intended for non-interactive use such as scripting.
1777 This option prevents
1779 from generating a diff of the to-be-committed changes in a temporary file
1780 which can be viewed while editing a commit message.
1782 Allow the addition of symbolic links which point outside of the path space
1783 that is under version control.
1786 will reject such symbolic links due to safety concerns.
1789 may decide to represent such a symbolic link as a regular file which contains
1790 the link's target path, rather than creating an actual symbolic link which
1791 points outside of the work tree.
1792 Use of this option is discouraged because external mechanisms such as
1794 are better suited for managing symbolic links to paths not under
1799 will refuse to run if certain preconditions are not met.
1800 If the work tree's current branch is not in the
1802 reference namespace, new commits may not be created on this branch.
1803 Local changes may only be committed if they are based on file content
1804 found in the most recent commit on the work tree's branch.
1805 If a path is found to be out of date,
1807 must be used first in order to merge local changes with changes made
1815 .Op Fl r Ar repository-path
1817 .Op Ar remote-repository
1820 Send new changes to a remote repository.
1822 .Ar remote-repository
1826 The remote repository's URL is obtained from the corresponding entry in
1830 file of the local repository, as created by
1833 All objects corresponding to new changes will be written to a temporary
1834 pack file which is then uploaded to the server.
1835 Upon success, references in the
1837 reference namespace of the local repository will be updated to point at
1838 the commits which have been sent.
1840 By default, changes will only be sent if they are based on up-to-date
1841 copies of relevant branches in the remote repository.
1842 If any changes to be sent are based on out-of-date copies or would
1843 otherwise break linear history of existing branches, new changes must
1844 be fetched from the server with
1846 and local branches must be rebased with
1853 option can be used to make exceptions to these requirements.
1860 Send all branches from the local repository's
1862 reference namespace.
1865 option is equivalent to listing all branches with multiple
1868 Cannot be used together with the
1874 from the local repository's
1876 reference namespace.
1877 This option may be specified multiple times to build a list of branches
1879 If this option is not specified, default to the work tree's current branch
1880 if invoked in a work tree, or to the repository's HEAD reference.
1881 Cannot be used together with the
1885 Delete the specified
1887 from the remote repository's
1889 reference namespace.
1890 This option may be specified multiple times to build a list of branches
1893 Only references are deleted.
1894 Any commit, tree, tag, and blob objects belonging to deleted branches
1895 may become subject to deletion by Git's garbage collector running on
1898 Requesting deletion of branches results in an error if the server
1899 does not support this feature or disallows the deletion of branches
1900 based on its configuration.
1902 Attempt to force the server to overwrite existing branches or tags
1903 in the remote repository, even when
1907 would usually be required before changes can be sent.
1908 The server may reject forced requests regardless, depending on its
1911 Any commit, tree, tag, and blob objects belonging to overwritten branches
1912 or tags may become subject to deletion by Git's garbage collector running
1917 reference namespace is globally shared between all repositories.
1920 option to overwrite tags is discouraged because it can lead to
1921 inconsistencies between the tags present in different repositories.
1922 In general, creating a new tag with a different name is recommended
1923 instead of overwriting an existing tag.
1927 option is particularly discouraged if changes being sent are based
1928 on an out-of-date copy of a branch in the remote repository.
1929 Instead of using the
1931 option, new changes should
1934 and local branches should be rebased with
1936 followed by another attempt to send the changes.
1940 option should only be needed in situations where the remote repository's
1941 copy of a branch or tag is known to be out-of-date and is considered
1943 The risks of creating inconsistencies between different repositories
1944 should also be taken into account.
1946 Suppress progress reporting output.
1947 The same option will be passed to
1950 .It Fl r Ar repository-path
1951 Use the repository at the specified path.
1952 If not specified, assume the repository is located at or above the current
1954 If this directory is a
1956 work tree, use the repository path associated with this work tree.
1958 Attempt to send all tags from the local repository's
1960 reference namespace.
1963 option is equivalent to listing all tags with multiple
1966 Cannot be used together with the
1972 from the local repository's
1974 reference namespace, in addition to any branches that are being sent.
1977 option may be specified multiple times to build a list of tags to send.
1978 No tags will be sent if the
1982 Raise an error if the specified
1984 already exists in the remote repository, unless the
1986 option is used to overwrite the server's copy of the tag.
1987 In general, creating a new tag with a different name is recommended
1988 instead of overwriting an existing tag.
1990 Cannot be used together with the
1997 to print debugging messages to standard error output.
1998 The same option will be passed to
2001 Multiple -v options increase the verbosity.
2011 Merge changes from a single
2016 should be on a different branch than the work tree's base commit.
2017 The expected argument is a reference or a commit ID SHA1 hash.
2018 An abbreviated hash argument will be expanded to a full SHA1 hash
2019 automatically, provided the abbreviation is unique.
2021 Show the status of each affected file, using the following status codes:
2022 .Bl -column YXZ description
2023 .It G Ta file was merged
2024 .It C Ta file was merged and conflicts occurred during merge
2025 .It ! Ta changes destined for a missing file were not merged
2026 .It D Ta file was deleted
2027 .It d Ta file's deletion was prevented by local modifications
2028 .It A Ta new file was added
2029 .It \(a~ Ta changes destined for a non-regular file were not merged
2030 .It ? Ta changes destined for an unversioned file were not merged
2033 The merged changes will appear as local changes in the work tree, which
2036 amended manually or with further
2042 If invoked in a work tree where no
2047 operation is taking place,
2049 creates a record of commits which have been merged into the work tree.
2050 When a file changed by
2054 the log messages of relevant merged commits will then appear in the editor,
2055 where the messages should be further adjusted to convey the reasons for
2056 cherrypicking the changes.
2057 Upon exiting the editor, if the time stamp of the log message file
2058 is unchanged or the log message is empty,
2060 will fail with an unmodified or empty log message error.
2062 If all the changes in all files touched by a given commit are discarded,
2065 this commit's log message record will also disappear.
2068 will refuse to run if certain preconditions are not met.
2069 If the work tree contains multiple base commits, it must first be updated
2070 to a single base commit with
2072 If any relevant files already contain merge conflicts, these
2073 conflicts must be resolved first.
2081 Display a list of commit log messages recorded by cherrypick operations,
2082 represented by references in the
2083 .Dq refs/got/worktree
2084 reference namespace.
2087 is specified, only show the log message of the specified commit.
2089 If invoked in a work tree, only log messages recorded by cherrypick operations
2090 in the current work tree will be displayed.
2091 Otherwise, all commit log messages will be displayed irrespective of the
2092 work tree in which they were created.
2093 This option cannot be used with
2096 Delete log messages created by previous cherrypick operations, represented by
2098 .Dq refs/got/worktree
2099 reference namespace.
2102 is specified, only delete the log message of the specified commit.
2104 If invoked in a work tree, only log messages recorded by cherrypick operations
2105 in the current work tree will be deleted.
2106 Otherwise, all commit log messages will be deleted irrespective of the
2107 work tree in which they were created.
2108 This option cannot be used with
2119 Reverse-merge changes from a single
2124 should be on the same branch as the work tree's base commit.
2125 The expected argument is a reference or a commit ID SHA1 hash.
2126 An abbreviated hash argument will be expanded to a full SHA1 hash
2127 automatically, provided the abbreviation is unique.
2129 Show the status of each affected file, using the following status codes:
2130 .Bl -column YXZ description
2131 .It G Ta file was merged
2132 .It C Ta file was merged and conflicts occurred during merge
2133 .It ! Ta changes destined for a missing file were not merged
2134 .It D Ta file was deleted
2135 .It d Ta file's deletion was prevented by local modifications
2136 .It A Ta new file was added
2137 .It \(a~ Ta changes destined for a non-regular file were not merged
2138 .It ? Ta changes destined for an unversioned file were not merged
2141 The reverse-merged changes will appear as local changes in the work tree,
2142 which may be viewed with
2144 amended manually or with further
2150 If invoked in a work tree where no
2155 operation is taking place,
2157 creates a record of commits which have been reverse-merged into the work tree.
2158 When a file changed by
2162 the log messages of relevant reverse-merged commits will then appear in
2163 the editor, where the messages should be further adjusted to convey the
2164 reasons for backing out the changes.
2165 Upon exiting the editor, if the time stamp of the log message file
2166 is unchanged or the log message is empty,
2168 will fail with an unmodified or empty log message error.
2170 If all the changes in all files touched by a given commit are discarded,
2173 this commit's log message record will also disappear.
2176 will refuse to run if certain preconditions are not met.
2177 If the work tree contains multiple base commits, it must first be updated
2178 to a single base commit with
2180 If any relevant files already contain merge conflicts, these
2181 conflicts must be resolved first.
2189 Display a list of commit log messages recorded by backout operations,
2190 represented by references in the
2191 .Dq refs/got/worktree
2192 reference namespace.
2195 is specified, only show the log message of the specified commit.
2197 If invoked in a work tree, only log messages recorded by backout operations
2198 in the current work tree will be displayed.
2199 Otherwise, all commit log messages will be displayed irrespective of the
2200 work tree in which they were created.
2201 This option cannot be used with
2204 Delete log messages created by previous backout operations, represented by
2206 .Dq refs/got/worktree
2207 reference namespace.
2210 is specified, only delete the log message of the specified commit.
2212 If invoked in a work tree, only log messages recorded by backout operations
2213 in the current work tree will be deleted.
2214 Otherwise, all commit log messages will be deleted irrespective of the
2215 work tree in which they were created.
2216 This option cannot be used with
2227 Rebase commits on the specified
2229 onto the tip of the current branch of the work tree.
2232 must share common ancestry with the work tree's current branch.
2233 Rebasing begins with the first descendant commit of the youngest
2234 common ancestor commit shared by the specified
2236 and the work tree's current branch, and stops once the tip commit
2243 is used as intended, the specified
2245 represents a local commit history and may already contain changes
2246 that are not yet visible in any other repositories.
2247 The work tree's current branch, which must be set with
2251 operation, represents a branch from a remote repository which shares
2252 a common history with the specified
2254 but has progressed, and perhaps diverged, due to commits added to the
2257 Rebased commits are accumulated on a temporary branch which the work tree
2258 will remain switched to throughout the entire rebase operation.
2259 Commits on this branch represent the same changes with the same log
2260 messages as their counterparts on the original
2262 but with different commit IDs.
2263 Once rebasing has completed successfully, the temporary branch becomes
2264 the new version of the specified
2266 and the work tree is automatically switched to it.
2267 If author information is available via the
2269 environment variable,
2275 configuration settings, this author information will be used to identify
2280 Old commits in their pre-rebase state are automatically backed up in the
2281 .Dq refs/got/backup/rebase
2282 reference namespace.
2283 As long as these references are not removed older versions of rebased
2284 commits will remain in the repository and can be viewed with the
2287 Removal of these references makes objects which become unreachable via
2288 any reference subject to removal by Git's garbage collector or
2289 .Cm gotadmin cleanup .
2291 While rebasing commits, show the status of each affected file,
2292 using the following status codes:
2293 .Bl -column YXZ description
2294 .It G Ta file was merged
2295 .It C Ta file was merged and conflicts occurred during merge
2296 .It ! Ta changes destined for a missing file were not merged
2297 .It D Ta file was deleted
2298 .It d Ta file's deletion was prevented by local modifications
2299 .It A Ta new file was added
2300 .It \(a~ Ta changes destined for a non-regular file were not merged
2301 .It ? Ta changes destined for an unversioned file were not merged
2304 If merge conflicts occur, the rebase operation is interrupted and may
2305 be continued once conflicts have been resolved.
2306 If any files with destined changes are found to be missing or unversioned,
2307 or if files could not be deleted due to differences in deleted content,
2308 the rebase operation will be interrupted to prevent potentially incomplete
2309 changes from being committed to the repository without user intervention.
2310 The work tree may be modified as desired and the rebase operation can be
2311 continued once the changes present in the work tree are considered complete.
2312 Alternatively, the rebase operation may be aborted which will leave
2314 unmodified and the work tree switched back to its original branch.
2316 If a merge conflict is resolved in a way which renders the merged
2317 change into a no-op change, the corresponding commit will be elided
2318 when the rebase operation continues.
2321 will refuse to run if certain preconditions are not met.
2326 reference namespace, the branch may not be rebased.
2327 If the work tree is not yet fully updated to the tip commit of its
2328 branch, then the work tree must first be updated with
2330 If changes have been staged with
2332 these changes must first be committed with
2336 If the work tree contains local changes, these changes must first be
2343 contains changes to files outside of the work tree's path prefix,
2344 the work tree cannot be used to rebase this branch.
2353 commands will refuse to run while a rebase operation is in progress.
2354 Other commands which manipulate the work tree may be used for
2355 conflict resolution purposes.
2359 is already based on the work tree's current branch, then no commits
2360 need to be rebased and
2362 will simply switch the work tree to the specified
2364 and update files in the work tree accordingly.
2371 Abort an interrupted rebase operation.
2372 If this option is used, no other command-line arguments are allowed.
2374 Allow a rebase operation to continue with files in conflicted status.
2375 This option should generally be avoided, and can only be used with the
2379 Continue an interrupted rebase operation.
2380 If this option is used, no other command-line arguments are allowed.
2382 Show a list of past rebase operations, represented by references in the
2383 .Dq refs/got/backup/rebase
2384 reference namespace.
2386 Display the author, date, and log message of each backed up commit,
2387 the object ID of the corresponding post-rebase commit, and
2388 the object ID of their common ancestor commit.
2389 Given these object IDs,
2396 options can be used to examine the history of either version of the branch,
2401 option can be used to create a new branch from a pre-rebase state if desired.
2405 is specified, only show commits which at some point in time represented this
2407 Otherwise, list all backed up commits for any branches.
2409 If this option is used,
2411 does not require a work tree.
2412 None of the other options can be used together with
2415 Delete backups created by past rebase operations, represented by references
2417 .Dq refs/got/backup/rebase
2418 reference namespace.
2422 is specified, only delete backups which at some point in time represented
2424 Otherwise, delete all references found within
2425 .Dq refs/got/backup/rebase .
2427 Any commit, tree, tag, and blob objects belonging to deleted backups
2428 remain in the repository and may be removed separately with
2429 Git's garbage collector or
2430 .Cm gotadmin cleanup .
2432 If this option is used,
2434 does not require a work tree.
2435 None of the other options can be used together with
2442 .Op Fl F Ar histedit-script
2446 Edit commit history between the work tree's current base commit and
2447 the tip commit of the work tree's current branch.
2451 command requires the
2453 environment variable to be set,
2454 unless an author has been configured in
2460 configuration settings can be obtained from the repository's
2462 file or from Git's global
2468 operation, the work tree's current branch must be set with
2470 to the branch which should be edited, unless this branch is already the
2471 current branch of the work tree.
2472 The tip of this branch represents the upper bound (inclusive) of commits
2477 Furthermore, the work tree's base commit
2480 to a point in this branch's commit history where editing should begin.
2481 This commit represents the lower bound (non-inclusive) of commits touched
2486 Editing of commit history is controlled via a
2488 which can be written in an editor based on a template, passed on the
2489 command line, or generated with the
2497 The format of the histedit script is line-based.
2498 Each line in the script begins with a command name, followed by
2499 whitespace and an argument.
2500 For most commands, the expected argument is a commit ID SHA1 hash.
2501 Any remaining text on the line is ignored.
2502 Lines which begin with the
2504 character are ignored entirely.
2506 The available histedit script commands are as follows:
2507 .Bl -column YXZ pick-commit
2508 .It Cm pick Ar commit Ta Use the specified commit as it is.
2509 .It Cm edit Ar commit Ta Apply the changes from the specified commit, but
2510 then interrupt the histedit operation for amending, without creating a commit.
2511 While the histedit operation is interrupted arbitrary files may be edited,
2512 and commands which manipulate the work tree can be used freely.
2517 commands can be used to add new files or remove existing ones.
2520 command can be used to eliminate arbitrary changes from files in the work tree.
2523 command may be used to prepare a subset of changes for inclusion in the
2527 command can be used to insert arbitrary commits into the edited history.
2528 Regular editing of history must eventually be resumed by running
2529 .Cm got histedit -c .
2530 .It Cm fold Ar commit Ta Combine the specified commit with the next commit
2531 listed further below that will be used.
2532 .It Cm drop Ar commit Ta Remove this commit from the edited history.
2533 .It Cm mesg Oo Ar log-message Oc Ta Create a new log message for the commit of
2538 command on the previous line of the histedit script.
2541 argument provides a new single-line log message to use.
2544 argument is omitted, open an editor where a new log message can be written.
2547 Every commit in the history being edited must be mentioned in the script.
2548 Lines may be re-ordered to change the order of commits in the edited history.
2549 No commit may be listed more than once.
2551 Edited commits are accumulated on a temporary branch which the work tree
2552 will remain switched to throughout the entire histedit operation.
2553 Once history editing has completed successfully, the temporary branch becomes
2554 the new version of the work tree's branch and the work tree is automatically
2557 Old commits in their pre-histedit state are automatically backed up in the
2558 .Dq refs/got/backup/histedit
2559 reference namespace.
2560 As long as these references are not removed older versions of edited
2561 commits will remain in the repository and can be viewed with the
2564 Removal of these references makes objects which become unreachable via
2565 any reference subject to removal by Git's garbage collector or
2566 .Cm gotadmin cleanup .
2568 While merging commits, show the status of each affected file,
2569 using the following status codes:
2570 .Bl -column YXZ description
2571 .It G Ta file was merged
2572 .It C Ta file was merged and conflicts occurred during merge
2573 .It ! Ta changes destined for a missing file were not merged
2574 .It D Ta file was deleted
2575 .It d Ta file's deletion was prevented by local modifications
2576 .It A Ta new file was added
2577 .It \(a~ Ta changes destined for a non-regular file were not merged
2578 .It ? Ta changes destined for an unversioned file were not merged
2581 If merge conflicts occur, the histedit operation is interrupted and may
2582 be continued once conflicts have been resolved.
2583 If any files with destined changes are found to be missing or unversioned,
2584 or if files could not be deleted due to differences in deleted content,
2585 the histedit operation will be interrupted to prevent potentially incomplete
2586 changes from being committed to the repository without user intervention.
2587 The work tree may be modified as desired and the histedit operation can be
2588 continued once the changes present in the work tree are considered complete.
2589 Alternatively, the histedit operation may be aborted which will leave
2590 the work tree switched back to its original branch.
2592 If a merge conflict is resolved in a way which renders the merged
2593 change into a no-op change, the corresponding commit will be elided
2594 when the histedit operation continues.
2597 will refuse to run if certain preconditions are not met.
2598 If the work tree's current branch is not in the
2600 reference namespace, the history of the branch may not be edited.
2601 If the work tree contains multiple base commits, it must first be updated
2602 to a single base commit with
2604 If changes have been staged with
2606 these changes must first be committed with
2610 If the work tree contains local changes, these changes must first be
2615 If the edited history contains changes to files outside of the work tree's
2616 path prefix, the work tree cannot be used to edit the history of this branch.
2624 commands will refuse to run while a histedit operation is in progress.
2625 Other commands which manipulate the work tree may be used, and the
2627 command may be used to commit arbitrary changes to the temporary branch
2628 while the histedit operation is interrupted.
2635 Abort an interrupted histedit operation.
2636 If this option is used, no other command-line arguments are allowed.
2638 Allow a histedit operation to continue with files in conflicted status.
2639 This option should generally be avoided, and can only be used with the
2643 Continue an interrupted histedit operation.
2644 If this option is used, no other command-line arguments are allowed.
2647 This option is a quick equivalent to a histedit script which drops all
2651 option can only be used when starting a new histedit operation.
2652 If this option is used, no other command-line arguments are allowed.
2654 Interrupt the histedit operation for editing after merging each commit.
2655 This option is a quick equivalent to a histedit script which uses the
2657 command for all commits.
2660 option can only be used when starting a new histedit operation.
2661 If this option is used, no other command-line arguments are allowed.
2662 .It Fl F Ar histedit-script
2665 instead of opening a temporary file in an editor where a histedit script
2668 Fold all commits into a single commit.
2669 This option is a quick equivalent to a histedit script which folds all
2670 commits, combining them all into one commit.
2673 option can only be used when starting a new histedit operation.
2674 If this option is used, no other command-line arguments are allowed.
2676 Show a list of past histedit operations, represented by references in the
2677 .Dq refs/got/backup/histedit
2678 reference namespace.
2680 Display the author, date, and log message of each backed up commit,
2681 the object ID of the corresponding post-histedit commit, and
2682 the object ID of their common ancestor commit.
2683 Given these object IDs,
2690 options can be used to examine the history of either version of the branch,
2695 option can be used to create a new branch from a pre-histedit state if desired.
2699 is specified, only show commits which at some point in time represented this
2701 Otherwise, list all backed up commits for any branches.
2703 If this option is used,
2705 does not require a work tree.
2706 None of the other options can be used together with
2709 Edit log messages only.
2710 This option is a quick equivalent to a histedit script which edits
2711 only log messages but otherwise leaves every picked commit as-is.
2714 option can only be used when starting a new histedit operation.
2715 If this option is used, no other command-line arguments are allowed.
2717 Delete backups created by past histedit operations, represented by references
2719 .Dq refs/got/backup/histedit
2720 reference namespace.
2724 is specified, only delete backups which at some point in time represented
2726 Otherwise, delete all references found within
2727 .Dq refs/got/backup/histedit .
2729 Any commit, tree, tag, and blob objects belonging to deleted backups
2730 remain in the repository and may be removed separately with
2731 Git's garbage collector or
2732 .Cm gotadmin cleanup .
2734 If this option is used,
2736 does not require a work tree.
2737 None of the other options can be used together with
2741 .It Cm integrate Ar branch
2743 Integrate the specified
2745 into the work tree's current branch.
2746 Files in the work tree are updated to match the contents on the integrated
2748 and the reference of the work tree's branch is changed to point at the
2749 head commit of the integrated
2752 Both branches can be considered equivalent after integration since they
2753 will be pointing at the same commit.
2754 Both branches remain available for future work, if desired.
2755 In case the integrated
2757 is no longer needed it may be deleted with
2760 Show the status of each affected file, using the following status codes:
2761 .Bl -column YXZ description
2762 .It U Ta file was updated
2763 .It D Ta file was deleted
2764 .It A Ta new file was added
2765 .It \(a~ Ta versioned file is obstructed by a non-regular file
2766 .It ! Ta a missing versioned file was restored
2770 will refuse to run if certain preconditions are not met.
2771 Most importantly, the
2773 must have been rebased onto the work tree's current branch with
2775 before it can be integrated, in order to linearize commit history and
2776 resolve merge conflicts.
2777 If the work tree contains multiple base commits, it must first be updated
2778 to a single base commit with
2780 If changes have been staged with
2782 these changes must first be committed with
2786 If the work tree contains local changes, these changes must first be
2798 Create a merge commit based on the current branch of the work tree and
2801 If a linear project history is desired, then use of
2803 should be preferred over
2805 However, even strictly linear projects may require merge commits in order
2806 to merge in new versions of third-party code stored on vendor branches
2810 Merge commits are commits based on multiple parent commits.
2811 The tip commit of the work tree's current branch, which must be set with
2815 operation, will be used as the first parent.
2816 The tip commit of the specified
2818 will be used as the second parent.
2820 No ancestral relationship between the two branches is required.
2821 If the two branches have already been merged previously, only new changes
2824 It is not possible to create merge commits with more than two parents.
2825 If more than one branch needs to be merged, then multiple merge commits
2826 with two parents each can be created in sequence.
2828 While merging changes found on the
2830 into the work tree, show the status of each affected file,
2831 using the following status codes:
2832 .Bl -column YXZ description
2833 .It G Ta file was merged
2834 .It C Ta file was merged and conflicts occurred during merge
2835 .It ! Ta changes destined for a missing file were not merged
2836 .It D Ta file was deleted
2837 .It d Ta file's deletion was prevented by local modifications
2838 .It A Ta new file was added
2839 .It \(a~ Ta changes destined for a non-regular file were not merged
2840 .It ? Ta changes destined for an unversioned file were not merged
2843 If merge conflicts occur, the merge operation is interrupted and conflicts
2844 must be resolved before the merge operation can continue.
2845 If any files with destined changes are found to be missing or unversioned,
2846 or if files could not be deleted due to differences in deleted content,
2847 the merge operation will be interrupted to prevent potentially incomplete
2848 changes from being committed to the repository without user intervention.
2849 The work tree may be modified as desired and the merge can be continued
2850 once the changes present in the work tree are considered complete.
2851 Alternatively, the merge operation may be aborted which will leave
2852 the work tree's current branch unmodified.
2854 If a merge conflict is resolved in a way which renders all merged
2855 changes into no-op changes, the merge operation cannot continue
2856 and must be aborted.
2859 will refuse to run if certain preconditions are not met.
2862 is based on the work tree's current branch, then no merge commit can
2865 may be used to integrate the
2868 If the work tree is not yet fully updated to the tip commit of its
2869 branch, then the work tree must first be updated with
2871 If the work tree contains multiple base commits, it must first be updated
2872 to a single base commit with
2874 If changes have been staged with
2876 these changes must first be committed with
2880 If the work tree contains local changes, these changes must first be
2887 contains changes to files outside of the work tree's path prefix,
2888 the work tree cannot be used to merge this branch.
2898 commands will refuse to run while a merge operation is in progress.
2899 Other commands which manipulate the work tree may be used for
2900 conflict resolution purposes.
2907 Abort an interrupted merge operation.
2908 If this option is used, no other command-line arguments are allowed.
2910 Allow a merge operation to continue with files in conflicted status.
2911 This option should generally be avoided, and can only be used with the
2915 Continue an interrupted merge operation.
2916 If this option is used, no other command-line arguments are allowed.
2918 Merge changes into the work tree as usual but do not create a merge
2920 The merge result can be adjusted as desired before a merge commit is
2923 Alternatively, the merge may be aborted with
2930 .Op Fl F Ar response-script
2934 Stage local changes for inclusion in the next commit.
2937 is specified, stage all changes in the work tree.
2938 Otherwise, stage changes at or within the specified paths.
2939 Paths may be staged if they are added, modified, or deleted according to
2942 Show the status of each affected file, using the following status codes:
2943 .Bl -column YXZ description
2944 .It A Ta file addition has been staged
2945 .It M Ta file modification has been staged
2946 .It D Ta file deletion has been staged
2949 Staged file contents are saved in newly created blob objects in the repository.
2950 These blobs will be referred to by tree objects once staged changes have been
2953 Staged changes affect the behaviour of
2958 While paths with staged changes exist, the
2960 command will refuse to commit any paths which do not have staged changes.
2961 Local changes created on top of staged changes can only be committed if
2962 the path is staged again, or if the staged changes are committed first.
2965 command will show both local changes and staged changes.
2968 command is able to display local changes relative to staged changes,
2969 and to display staged changes relative to the repository.
2972 command cannot revert staged changes but may be used to revert
2973 local changes created on top of staged changes.
2979 .It Fl F Ar response-script
2987 responses line-by-line from the specified
2989 file instead of prompting interactively.
2991 Instead of staging new changes, list paths which are already staged,
2992 along with the IDs of staged blob objects and stage status codes.
2993 If paths were provided on the command line, show the staged paths
2994 among the specified paths.
2995 Otherwise, show all staged paths.
2997 Instead of staging the entire content of a changed file, interactively
2998 select or reject changes for staging based on
3002 (reject change), and
3004 (quit staging this file) responses.
3005 If a file is in modified status, individual patches derived from the
3006 modified file content can be staged.
3007 Files in added or deleted status may only be staged or rejected in
3010 Allow staging of symbolic links which point outside of the path space
3011 that is under version control.
3014 will reject such symbolic links due to safety concerns.
3017 may decide to represent such a symbolic link as a regular file which contains
3018 the link's target path, rather than creating an actual symbolic link which
3019 points outside of the work tree.
3020 Use of this option is discouraged because external mechanisms such as
3022 are better suited for managing symbolic links to paths not under
3027 will refuse to run if certain preconditions are not met.
3028 If a file contains merge conflicts, these conflicts must be resolved first.
3029 If a file is found to be out of date relative to the head commit on the
3030 work tree's current branch, the file must be updated with
3032 before it can be staged (however, this does not prevent the file from
3033 becoming out-of-date at some point after having been staged).
3040 commands will refuse to run while staged changes exist.
3041 If staged changes cannot be committed because a staged path
3042 is out of date, the path must be unstaged with
3044 before it can be updated with
3046 and may then be staged again if necessary.
3051 .Op Fl F Ar response-script
3055 Merge staged changes back into the work tree and put affected paths
3056 back into non-staged status.
3059 is specified, unstage all staged changes across the entire work tree.
3060 Otherwise, unstage changes at or within the specified paths.
3062 Show the status of each affected file, using the following status codes:
3063 .Bl -column YXZ description
3064 .It G Ta file was unstaged
3065 .It C Ta file was unstaged and conflicts occurred during merge
3066 .It ! Ta changes destined for a missing file were not merged
3067 .It D Ta file was staged as deleted and still is deleted
3068 .It d Ta file's deletion was prevented by local modifications
3069 .It \(a~ Ta changes destined for a non-regular file were not merged
3076 .It Fl F Ar response-script
3084 responses line-by-line from the specified
3086 file instead of prompting interactively.
3088 Instead of unstaging the entire content of a changed file, interactively
3089 select or reject changes for unstaging based on
3093 (keep change staged), and
3095 (quit unstaging this file) responses.
3096 If a file is staged in modified status, individual patches derived from the
3097 staged file content can be unstaged.
3098 Files staged in added or deleted status may only be unstaged in their entirety.
3104 .Op Fl r Ar repository-path
3107 Parse and print contents of objects to standard output in a line-based
3109 Content of commit, tree, and tag objects is printed in a way similar
3110 to the actual content stored in such objects.
3111 Blob object contents are printed as they would appear in files on disk.
3113 Attempt to interpret each argument as a reference, a tag name, or
3114 an object ID SHA1 hash.
3115 References will be resolved to an object ID.
3116 Tag names will resolved to a tag object.
3117 An abbreviated hash argument will be expanded to a full SHA1 hash
3118 automatically, provided the abbreviation is unique.
3120 If none of the above interpretations produce a valid result, or if the
3122 option is used, attempt to interpret the argument as a path which will
3123 be resolved to the ID of an object found at this path in the repository.
3130 Look up paths in the specified
3132 If this option is not used, paths are looked up in the commit resolved
3133 via the repository's HEAD reference.
3134 The expected argument is a commit ID SHA1 hash or an existing reference
3135 or tag name which will be resolved to a commit ID.
3136 An abbreviated hash argument will be expanded to a full SHA1 hash
3137 automatically, provided the abbreviation is unique.
3139 Interpret all arguments as paths only.
3140 This option can be used to resolve ambiguity in cases where paths
3141 look like tag names, reference names, or object IDs.
3142 .It Fl r Ar repository-path
3143 Use the repository at the specified path.
3144 If not specified, assume the repository is located at or above the current
3146 If this directory is a
3148 work tree, use the repository path associated with this work tree.
3150 .It Cm info Op Ar path ...
3151 Display meta-data stored in a work tree.
3156 The work tree to use is resolved implicitly by walking upwards from the
3157 current working directory.
3161 arguments are specified, show additional per-file information for tracked
3162 files located at or within these paths.
3165 argument corresponds to the work tree's root directory, display information
3166 for all tracked files.
3169 .Bl -tag -width GOT_IGNORE_GITCONFIG
3171 The author's name and email address, such as
3172 .Dq An Flan Hacker Aq Mt flan_hacker@openbsd.org .
3182 may fail to parse commits without an email address in author data,
3186 environment variables with a missing email address.
3188 .Ev GOT_AUTHOR will be overridden by configuration settings in
3194 configuration settings in the repository's
3201 configuration settings contained in Git's global
3203 configuration file will only be used if neither
3207 environment variable provide author information.
3208 .It Ev GOT_IGNORE_GITCONFIG
3209 If this variable is set then any remote repository definitions or author
3210 information found in Git configuration files will be ignored.
3211 .It Ev GOT_LOG_DEFAULT_LIMIT
3212 The default limit on the number of commits traversed by
3214 If set to zero, the limit is unbounded.
3215 This variable will be silently ignored if it is set to a non-numeric value.
3216 .It Ev VISUAL , EDITOR
3217 The editor spawned by
3225 text editor will be spawned.
3228 .Bl -tag -width packed-refs -compact
3230 Repository-wide configuration settings for
3234 configuration file located in the root directory of a Git repository
3235 supersedes any relevant settings in Git's
3239 .It Pa .got/got.conf
3240 Worktree-specific configuration settings for
3244 configuration file in the
3246 meta-data directory of a work tree supersedes any relevant settings in
3249 configuration file and Git's
3256 Enable tab-completion of
3261 .Dl $ set -A complete_got_1 -- $(got -h 2>&1 | sed -n s/commands://p)
3263 Clone an existing Git repository for use with
3267 .Dl $ got clone ssh://git@github.com/openbsd/src.git
3269 Use of HTTP URLs currently requires
3273 .Dl $ git clone --bare https://github.com/openbsd/src.git
3275 Alternatively, for quick and dirty local testing of
3277 a new Git repository could be created and populated with files,
3278 e.g. from a temporary CVS checkout located at
3281 .Dl $ gotadmin init /var/git/src.git
3282 .Dl $ got import -r /var/git/src.git -I CVS -I obj /tmp/src
3284 Check out a work tree from the Git repository to /usr/src:
3286 .Dl $ got checkout /var/git/src.git /usr/src
3288 View local changes in a work tree directory:
3290 .Dl $ got diff | less
3292 In a work tree, display files in a potentially problematic state:
3294 .Dl $ got status -s 'C!~?'
3296 Interactively revert selected local changes in a work tree directory:
3298 .Dl $ got revert -p -R\ .
3300 In a work tree or a git repository directory, list all branch references:
3304 As above, but list the most recently modified branches only:
3306 .Dl $ got branch -lt | head
3308 In a work tree or a git repository directory, create a new branch called
3309 .Dq unified-buffer-cache
3310 which is forked off the
3314 .Dl $ got branch -c master unified-buffer-cache
3316 Switch an existing work tree to the branch
3317 .Dq unified-buffer-cache .
3318 Local changes in the work tree will be preserved and merged if necessary:
3320 .Dl $ got update -b unified-buffer-cache
3322 Create a new commit from local changes in a work tree directory.
3323 This new commit will become the head commit of the work tree's current branch:
3327 In a work tree or a git repository directory, view changes committed in
3328 the 3 most recent commits to the work tree's branch, or the branch resolved
3329 via the repository's HEAD reference, respectively:
3331 .Dl $ got log -p -l 3
3333 As above, but display changes in the order in which
3335 could apply them in sequence:
3337 .Dl $ got log -p -l 3 -R
3339 In a work tree or a git repository directory, log the history of a subdirectory:
3341 .Dl $ got log sys/uvm
3343 While operating inside a work tree, paths are specified relative to the current
3344 working directory, so this command will log the subdirectory
3347 .Dl $ cd sys/uvm && got log\ .
3349 And this command has the same effect:
3351 .Dl $ cd sys/dev/usb && got log ../../uvm
3353 And this command displays work tree meta-data about all tracked files:
3356 .Dl $ got info\ . | less
3358 Add new files and remove obsolete files in a work tree directory:
3360 .Dl $ got add sys/uvm/uvm_ubc.c
3361 .Dl $ got remove sys/uvm/uvm_vnode.c
3363 Create a new commit from local changes in a work tree directory
3364 with a pre-defined log message.
3366 .Dl $ got commit -m 'unify the buffer cache'
3368 Alternatively, create a new commit from local changes in a work tree
3369 directory with a log message that has been prepared in the file
3372 .Dl $ got commit -F /tmp/msg
3374 Update any work tree checked out from the
3375 .Dq unified-buffer-cache
3376 branch to the latest commit on this branch:
3380 Roll file content on the unified-buffer-cache branch back by one commit,
3381 and then fetch the rolled-back change into the work tree as a local change
3382 to be amended and perhaps committed again:
3384 .Dl $ got backout unified-buffer-cache
3385 .Dl $ got commit -m 'roll back previous'
3386 .Dl $ # now back out the previous backout :-)
3387 .Dl $ got backout unified-buffer-cache
3389 Fetch new changes on the remote repository's
3391 branch, making them visible on the local repository's
3398 In a repository created with a HTTP URL and
3399 .Cm git clone --bare
3402 command must be used instead:
3404 .Dl $ cd /var/git/src.git
3405 .Dl $ git fetch origin master:refs/remotes/origin/master
3409 branch to merge the new changes that are now visible on the
3414 .Dl $ got update -b origin/master
3415 .Dl $ got rebase master
3418 .Dq unified-buffer-cache
3419 branch on top of the new head commit of the
3423 .Dl $ got update -b master
3424 .Dl $ got rebase unified-buffer-cache
3426 Create a patch from all changes on the unified-buffer-cache branch.
3427 The patch can be mailed out for review and applied to
3431 .Dl $ got diff master unified-buffer-cache > /tmp/ubc.diff
3433 Edit the entire commit history of the
3434 .Dq unified-buffer-cache
3437 .Dl $ got update -b unified-buffer-cache
3438 .Dl $ got update -c master
3441 Before working against existing branches in a repository cloned with
3442 .Cm git clone --bare
3447 must be configured to map all references in the remote repository
3450 namespace of the local repository.
3451 This can be achieved by setting Git's
3452 .Pa remote.origin.fetch
3453 configuration variable to the value
3454 .Dq +refs/heads/*:refs/remotes/origin/*
3459 .Dl $ cd /var/git/repo
3460 .Dl $ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
3464 option must be disabled:
3466 .Dl $ cd /var/git/repo
3467 .Dl $ git config remote.origin.mirror false
3469 Alternatively, the following
3471 configuration item can be added manually to the Git repository's
3475 .Dl [remote \&"origin\&"]
3477 .Dl fetch = +refs/heads/*:refs/remotes/origin/*
3480 This configuration leaves the local repository's
3482 namespace free for use by local branches checked out with
3484 and, if needed, created with
3487 .Dq refs/remotes/origin
3488 namespace can now be updated with incoming changes from the remote
3493 without extra command line arguments.
3494 Newly fetched changes can be examined with
3497 Display changes on the remote repository's version of the
3499 branch, as of the last time
3503 .Dl $ got log -c origin/master | less
3505 As shown here, most commands accept abbreviated reference names such as
3508 .Dq refs/remotes/origin/master .
3509 The latter is only needed in case of ambiguity.
3512 must be used to merge changes which are visible on the
3517 This will also merge local changes, if any, with the incoming changes:
3519 .Dl $ got update -b origin/master
3520 .Dl $ got rebase master
3522 In order to make changes committed to the
3523 .Dq unified-buffer-cache
3527 .Dq unified-buffer-cache
3528 branch must first be rebased onto the
3532 .Dl $ got update -b master
3533 .Dl $ got rebase unified-buffer-cache
3536 .Dq unified-buffer-cache
3537 branch can now be made visible on the
3541 Because the rebase operation switched the work tree to the
3542 .Dq unified-buffer-cache
3543 branch, the work tree must be switched back to the
3547 .Dl $ got update -b master
3548 .Dl $ got integrate unified-buffer-cache
3552 branch, log messages for local changes can now be amended with
3554 by other developers and any other important new information:
3556 .Dl $ got update -c origin/master
3557 .Dl $ got histedit -m
3559 If the remote repository offers write access, local changes on the
3561 branch can be sent to the remote repository with
3565 can be run without further arguments.
3566 The arguments shown here match defaults, provided the work tree's
3567 current branch is the
3571 .Dl $ got send -b master origin
3573 If the remote repository requires the HTTPS protocol, the
3575 command must be used instead:
3577 .Dl $ cd /var/git/src.git
3578 .Dl $ git push origin master
3580 When making contributions to projects which use the
3582 workflow, SSH protocol repository access needs to be set up first.
3583 Once an account has been created on a Git hosting site it should
3584 be possible to upload a public SSH key for repository access
3589 workflow will usually involve two remote repositories.
3590 In the real-life example below, the
3592 repository was forked from the
3594 repository by using the Git hosting site's web interface.
3597 file in the local repository describes both remote repositories:
3598 .Bd -literal -offset indent
3599 # Jelmers's repository, which accepts pull requests
3601 server git@github.com
3603 repository "/jelmer/dulwich"
3607 # Stefan's fork, used as the default remote repository
3609 server git@github.com
3611 repository "/stspdotname/dulwich"
3616 With this configuration, Stefan can create commits on
3617 .Dq refs/heads/master
3618 and send them to the
3620 repository by running:
3622 .Dl $ got send -b master origin
3624 The changes can now be proposed to Jelmer by opening a pull request
3625 via the Git hosting site's web interface.
3626 If Jelmer requests further changes to be made, additional commits
3627 can be created on the
3629 branch and be added to the pull request by running
3633 If Jelmer prefers additional commits to be
3635 then the following commands can be used to achieve this:
3637 .Dl $ got update -b master
3638 .Dl $ got update -c origin/master
3639 .Dl $ got histedit -f
3640 .Dl $ got send -f -b master origin
3642 Once Jelmer has accepted the pull request, Stefan can fetch the
3643 merged changes, and possibly several other new changes, by running:
3645 .Dl $ got fetch upstream
3647 The merged changes will now be visible under the reference
3648 .Dq refs/remotes/upstream/master .
3651 branch can now be rebased on top of the latest changes
3654 .Dl $ got update -b upstream/master
3655 .Dl $ got rebase master
3657 As a final step, the forked repository's copy of the master branch needs
3658 to be kept in sync by sending the new changes there:
3660 .Dl $ got send -f -b master origin
3662 If multiple pull requests need to be managed in parallel, a separate branch
3663 must be created for each pull request with
3665 Each such branch can then be used as above, in place of
3666 .Dq refs/heads/master .
3667 Changes for any accepted pull requests will still appear under
3668 .Dq refs/remotes/upstream/master,
3669 regardless of which branch was used in the forked repository to
3670 create a pull request.
3674 .Xr git-repository 5 ,
3675 .Xr got-worktree 5 ,
3679 .An Anthony J. Bentley Aq Mt bentley@openbsd.org
3680 .An Christian Weisgerber Aq Mt naddy@openbsd.org
3681 .An Hiltjo Posthuma Aq Mt hiltjo@codemadness.org
3682 .An Josh Rickmar Aq Mt jrick@zettaport.com
3683 .An Joshua Stein Aq Mt jcs@openbsd.org
3684 .An Klemens Nanni Aq Mt kn@openbsd.org
3685 .An Martin Pieuchot Aq Mt mpi@openbsd.org
3686 .An Neels Hofmeyr Aq Mt neels@hofmeyr.de
3687 .An Omar Polo Aq Mt op@openbsd.org
3688 .An Ori Bernstein Aq Mt ori@openbsd.org
3689 .An Sebastien Marie Aq Mt semarie@openbsd.org
3690 .An Stefan Sperling Aq Mt stsp@openbsd.org
3691 .An Steven McDonald Aq Mt steven@steven-mcdonald.id.au
3692 .An Theo Buehler Aq Mt tb@openbsd.org
3693 .An Thomas Adam Aq Mt thomas@xteddy.org
3694 .An Tracey Emery Aq Mt tracey@traceyemery.net
3695 .An Yang Zhong Aq Mt yzhong@freebsdfoundation.org
3702 were derived from code under copyright by:
3704 .An Caldera International
3705 .An Daniel Hartmeier
3710 .An Jean-Francois Brousseau
3716 .An Niklas Hallqvist
3721 .An Xavier Santolaria
3724 contains code contributed to the public domain by
3725 .An Austin Appleby .
3728 is a work-in-progress and some features remain to be implemented.
3730 At present, the user has to fall back on
3732 to perform some tasks.
3736 Reading from remote repositories over HTTP or HTTPS protocols requires
3741 Writing to remote repositories over HTTP or HTTPS protocols requires
3744 The creation of merge commits with more than two parent commits requires
3747 In situations where files or directories were moved around
3749 will not automatically merge changes to new locations and
3751 will usually produce better results.
