HISTORY

@@ -213,7 +217,7 @@ - +

August 2, 2020

September 17, 2020

OpenBSD 6.7

blob - 152df8aef174da28e6c4e26ea6523217d2893311 blob + 68f478cda110078638f0c290db8aef071bc282cb --- got-worktree.5.html +++ got-worktree.5.html @@ -41,8 +41,8 @@

NAME

got-worktree — Got - worktree format

got-worktree — + Game of Trees work tree format

DESCRIPTION

@@ -127,12 +127,22 @@ file addition or modification has been staged with

got
       stage

. -

A corrupt or missing file index can be recreated on demand with - got update. When the file index is modified, it is - read into memory in its entirety, modified in place, and written to a - temporary file. This temporary file is then moved on top of the old file - index with rename(2). This ensures that no other processes - see an inconsistent file index which is in the process of being written.

A corrupt or missing file index can be recreated on demand as + follows:

$ mv .got/file-index
+  .got/file-index.bad

$ got update # re-create
+  .got/file-index

$ find . -type f -exec touch
+  {} \; # update timestamp of all files

$ got update # sync
+  timestamps

When the file index is modified, it is read into memory in its + entirety, modified in place, and written to a temporary file. This temporary + file is then moved on top of the old file index with + rename(2). This ensures that no other processes see an + inconsistent file index which is in the process of being written.

Work tree meta data must only be modified while the work tree's lock file has been exclusively locked with lockf(3).

@@ -155,6 +165,9 @@

File status information.

format

Work tree format number.

got.conf

Configuration file for got(1). See + got.conf(5).

head-ref

Name of the reference to the current branch.

lock

@@ -172,12 +185,13 @@ ALSO

got(1), rename(2), stat(2), umask(2), - lockf(3), git-repository(5)

+ lockf(3), git-repository(5), + got.conf(5)

- +

August 2, 2020

September 17, 2020

OpenBSD 6.7

blob - 24baf649ba8001d178764ad3b20cab3c5b2a7c2b blob + bc7b860845b6538f9b85d6daaea4aaf6d7b57435 --- got.1.html +++ got.1.html @@ -105,7 +105,8 @@ the path of each imported file to indicate progress.

The got import command requires the GOT_AUTHOR environment variable to be set, - unless Git's user.name and + unless an author has been configured in got.conf(5) or + Git's user.name and user.email configuration settings can be obtained from the repository's .git/config file or from Git's global ~/.gitconfig configuration @@ -178,10 +179,10 @@ time. More details about the pack file format are documented in git-repository(5).

got clone creates a remote repository - entry in the config file of the cloned - repository to store the repository-url for future - use by got fetch or - git-fetch(1).

+ entry in the got.conf(5) and + config files of the cloned repository to store + the repository-url for future use by + got fetch or git-fetch(1).

The options for got clone are as follows:

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

The repository's config file will - be set up with the “mirror” option enabled, such that +

The repository's got.conf(5) and + config files will be set up with the + “mirror” option enabled, such that got fetch or git-fetch(1) will write incoming changes directly to branches in the “refs/heads/” reference namespace, rather than to @@ -266,9 +268,9 @@

Fetch new changes from a remote repository. If no remote-repository is specified, “origin” will be used. The remote repository's URL is - obtained from the corresponding entry in the - config file of the local repository, as created by - got clone. + obtained from the corresponding entry in got.conf(5) or + Git's config file of the local repository, as + created by got clone.

New changes will be stored in a separate pack file downloaded from the server. Optionally, separate pack files stored in the repository can be combined with git-repack(1).

@@ -523,6 +525,7 @@

up

Short alias for update.

status + [-s status-codes] [path ...]

Show the current modification status of files in a work tree, using the following status codes: @@ -597,6 +600,18 @@ file was modified after having been staged for addition +

The options for got status are as + follows:

-s + status-codes: Only show files with a modification status matching any of the + single-character status codes contained in the + status-codes argument. Any combination of codes + from the above list of possible status codes may be specified. For + staged files, status codes displayed in either column will be + matched.

For compatibility with cvs(1) and git(1), got status reads glob(7) patterns from @@ -686,7 +701,7 @@

-s +

-s search-pattern

If specified, show only commits with a log message matched by the extended regular expression search-pattern. When @@ -738,7 +753,7 @@ 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.

-s

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

-s +

-s reference

-rCreate a symbolic reference, or change an existing symbolic reference. The symbolic reference with the specified name @@ -1052,7 +1067,8 @@

remove [-f] [-k] - [-R] path ...

-R-sstatus-codespath ...Remove versioned files from a work tree and schedule them for deletion from the repository in the next commit.

The options for got remove are as @@ -1067,6 +1083,24 @@

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

-s + status-codes

Only delete files with a modification status matching one of the + single-character status codes contained in the + status-codes argument. The following status + codes may be specified: + + + + + + + + + +

M	modified file (this implies the `-f` + option)
!	versioned file expected on disk but missing

rm

@@ -1145,7 +1179,8 @@ entire work tree.

The got commit command requires the GOT_AUTHOR environment variable to be set, - unless Git's user.name and + unless an author has been configured in got.conf(5) or + Git's user.name and user.email configuration settings can be obtained from the repository's .git/config file or from Git's global ~/.gitconfig configuration @@ -1809,21 +1844,25 @@ email address in author data, got attempts to reject GOT_AUTHOR environment variables with a missing email address. -

If present, Git's user.name - and user.email configuration settings in the - repository's .git/config file will override the - value of GOT_AUTHOR. However, the +

GOT_AUTHOR will be overriden by configuration + settings in got.conf(5) or by Git's + user.name and user.email + configuration settings in the repository's + .git/config file. The user.name and user.email configuration settings contained in Git's global - ~/.gitconfig configuration file will be used - only if the GOT_AUTHOR environment variable is - not set.

+ ~/.gitconfig configuration file will only be + used if neither got.conf(5) nor the + GOT_AUTHOR environment variable provide author + information.

VISUAL, EDITOR

The editor spawned by got commit, - got import, or

got
-    tag

+ got histedit, got import, + or got tag. If not set, the + ed(1) text editor will be spawned in order to give + ed(1) the attention it deserves.

GOT_LOG_DEFAULT_LIMIT

The default limit on the number of commits traversed by got log. If set to zero, the limit is unbounded. @@ -1832,6 +1871,24 @@

SEE ALSO

HISTORY

NAME

DESCRIPTION

FILES

EXIT STATUS

SEE ALSO

AUTHORS