commit a462773eaf5ca2e0e9947d50200341f491c9c32e from: Stefan Sperling date: Sun Apr 19 10:01:42 2020 UTC sync man pages commit - 9e67ab87b19a7e0aac9ed41bc90ab61578403f28 commit + a462773eaf5ca2e0e9947d50200341f491c9c32e blob - 3dc3b7033b11831036e185f78862d7e9c05a01a1 blob + f7ac2fadb65e9b037bd344285a4a0b35ffaf103a --- git-repository.5.html +++ git-repository.5.html @@ -207,7 +207,7 @@ - +

April 14, 2020

April 19, 2020

OpenBSD 6.6

blob - a96f97bad2fc8a37465b7629293f123659c5a4c9 blob + 6a332b1cdd3baba23e69da56c0ac22cc7bbc7da3 --- got-worktree.5.html +++ got-worktree.5.html @@ -174,7 +174,7 @@ - +

April 14, 2020

April 19, 2020

OpenBSD 6.6

blob - efb9dea47719450d19ecdde457ebb9fe647eeccd blob + 88d2eb8d31d2efd25d1fcd643418af54eb64b861 --- got.1.html +++ got.1.html @@ -210,17 +210,18 @@

-m

Create the cloned repository as a mirror of the original repository. This is useful if the cloned repository will not be used to store - local changes as created by got commit. + locally created commits.

The repository's config file will be set up with the “mirror” option enabled, such that got fetch or git-fetch(1) - will write incoming changes directly to local branches in the + will write incoming changes directly to branches in the “refs/heads/” reference namespace, rather than to branches in the “refs/remotes/” namespace. This avoids the usual requirement of having to run got rebase after got fetch in order to - make incoming changes appear on local branches. But maintaining - local changes in the cloned repository becomes difficult since local + make incoming changes appear on branches in the + “refs/heads/” namespace. But maintaining custom + changes in the cloned repository becomes difficult since such changes will be at risk of being discarded whenever incoming changes are fetched.

@@ -276,15 +277,15 @@ “refs/remotes/” reference namespace will be updated to point at the newly fetched commits. The

got
         rebase

command can then be used to make new changes visible on - local branches in the “refs/heads/” namespace, merging - incoming changes with local changes as necessary.

+ branches in the “refs/heads/” namespace, merging incoming + changes with the changes on those branches as necessary.

If the repository was created as a mirror with got clone -m then all branches in the “refs/heads/” namespace will be updated directly to match the corresponding branches in the remote repository. If those branches contained local commits, these commits will no longer be reachable via a reference and will therefore be at risk of being discarded by Git's - garbage collector. Maintaining local changes in a mirror repository is + garbage collector. Maintaining custom changes in a mirror repository is therefore discouraged.

In any case, references in the “refs/tags/” namespace will always be fetched and mapped directly to local references @@ -349,8 +350,8 @@ was created as a mirror with got clone -m in which case references will be mapped directly into the local repository's “refs/” namespace.

Once a reference has been fetched, a local branch based on - it can be created with got branch if +

Once a reference has been fetched, a branch based on it + can be created with got branch if needed.

got fetch will refuse to fetch references from the remote repository's @@ -429,6 +430,12 @@ Change existing files in the work tree as necessary to match file contents of this commit. Preserve any local changes in the work tree and merge them with the incoming changes. +

Files which already contain merge conflicts will not be + updated to avoid further complications. Such files will be updated when + got update is run again after merge conflicts + have been resolved. If the conflicting changes are no longer needed + affected files can be reverted with got revert + before running got update again.

Show the status of each affected file, using the following status codes:

@@ -459,6 +466,10 @@ + + + +

!	a missing versioned file was restored
#	file was not updated because it contains merge conflicts

If no path is specified, update the @@ -608,7 +619,8 @@ N] [-p] [-s search-pattern] [-r repository-path] - [path] + [-R] [-x + commit] [path]

Display history of a repository. If a path is specified, show only commits which modified this path. If invoked in a work tree, the path is interpreted relative to the @@ -660,6 +672,15 @@ repository is located at or above the current working directory. If this directory is a got work tree, use the repository path associated with this work tree.

-R

Determine a set of commits to display as usual, but display these + commits in reverse order.

-x + commit

Stop traversing commit history as soon as the specified + commit has been traversed. This option has no + effect if the specified commit is never + traversed.

diff @@ -669,7 +690,7 @@ [object1 object2 | path]

When invoked within a work tree with less than two arguments, display - uncommitted changes in the work tree. If a path is + local changes in the work tree. If a path is specified, only show changes within this path.

If two arguments are provided, treat each argument as a reference, a tag name, or an object ID SHA1 hash, and display @@ -692,7 +713,7 @@ repository path associated with this work tree.

-s

Show changes staged with got stage instead of - showing local changes. This option is only valid when + showing local changes in the work tree. This option is only valid when got diff is invoked in a work tree.

-w

Ignore whitespace-only changes.

@@ -775,7 +796,7 @@

-i

Show object IDs of files (blob objects) and directories (tree objects).

-R

Recurse into sub-directories in the repository.

@@ -991,7 +1012,7 @@

The options for got add are as follows:

-R
-R: Permit recursion into directories. If this option is not specified, got add will refuse to run if a specified path is a directory.