commit cc85973b1fe6b3135eec29851b66a474bfc9e379 from: Stefan Sperling date: Wed Nov 27 03:37:17 2019 UTC sync man pages commit - a7200bb7b53a5b20794f21289ba7cf343a166ac7 commit + cc85973b1fe6b3135eec29851b66a474bfc9e379 blob - be478ca88f2813163f659b1ad60fe5bdcf905c35 blob + f9f1baacd73e07babd264515c83fb013ab2e3040 --- git-repository.5.html +++ git-repository.5.html @@ -208,7 +208,7 @@ - +
October 21, 2019November 27, 2019 OpenBSD 6.6
blob - 246d05b5fa9703a29568fdd11cb9358fef94f448 blob + 991e520c14c73dad6fb9211c4b1062bff36e0679 --- got-worktree.5.html +++ got-worktree.5.html @@ -174,7 +174,7 @@ - +
October 21, 2019November 27, 2019 OpenBSD 6.6
blob - d45bc51f501abcb7cb86e0a99517b8a961e34f31 blob + 0e9bc9d32378fc8a13abd6b2dc8ff0a1b955ddcf --- got.1.html +++ got.1.html @@ -116,8 +116,8 @@
branch
Create the specified branch instead of creating - the default branch “master”. Use of this option is - required if the “master” branch already exists.
+ the default branch “main”. Use of this option is + required if the “main” branch already exists.
message
Use the specified log message when creating the new commit. Without @@ -548,28 +548,31 @@
+ [-c commit] [-r repository-path] [-l] [-d - name] [name - [commit]]
+ name] [name]
Manage branches in a repository.

Branches are managed via references which live in the “refs/heads/” reference namespace. The got branch command operates on references in this namespace only.

If invoked in a work tree without any arguments, print the - name of the work tree's current branch. If one or two arguments are - passed, attempt to create a branch reference with the given - name, and make it point at the given - commit. The expected commit - argument is a commit ID SHA1 hash or an existing reference or tag name - which will be resolved to a commit ID. If no - commit is specified, default to the latest commit - on the work tree's current branch if invoked in a work tree, or to a - commit resolved via the repository's HEAD reference.

+ name of the work tree's current branch. If a name + argument is passed, attempt to create a branch reference with the given + name. By default the new branch reference will point at the latest + commit on the work tree's current branch if invoked in a work tree, and + otherwise to a commit resolved via the repository's HEAD reference.

The options for got branch are as follows:

+
+ commit
+
Make a newly created branch reference point at the specified + commit. The expected + commit argument is a commit ID SHA1 hash or an + existing reference or tag name which will be resolved to a commit + ID.
repository-path
Use the repository at the specified path. If not specified, assume the @@ -628,7 +631,7 @@
message
Use the specified tag message when creating the new tag Without the - -m option, got import + -m option, got tag opens a temporary file in an editor where a tag message can be written.
@@ -649,9 +652,18 @@ copied to another repository.

- file-path ...
+ [-R] path ...
Schedule unversioned files in a work tree for addition to the repository - in the next commit.
+ in the next commit. +

The options for got add are as + follows:

+
+
+
Permit recursion into directories. If this option is not specified, + got add will refuse to run if a specified + path is a directory.
+
+
file-path ...
Remove versioned files from a work tree and schedule them for deletion @@ -694,7 +706,7 @@ “n”, and “q” responses line-by-line from the specified response-script file instead of prompting interactively.
-
+
Permit recursion into directories. If this option is not specified, got revert will refuse to run if a specified path is a directory.
@@ -952,7 +964,7 @@
Abort an interrupted rebase operation. If this option is used, no other command-line arguments are allowed.
-
+
Continue an interrupted rebase operation. If this option is used, no other command-line arguments are allowed.
@@ -1071,7 +1083,7 @@
Abort an interrupted histedit operation. If this option is used, no other command-line arguments are allowed.
-
+
Continue an interrupted histedit operation. If this option is used, no other command-line arguments are allowed.
@@ -1287,7 +1299,7 @@

The options for got cat are as follows:

-
+
commit
Look up paths in the specified commit. If this option is not used, paths are looked up in the commit resolved via the @@ -1552,7 +1564,7 @@ - +
October 21, 2019November 27, 2019 OpenBSD 6.6
blob - 219b56b401d8442414a26afe15f4bb4535f3e7c3 blob + 2b64569a6b196ae9f12d0121a6201fcc53938a50 --- tog.1.html +++ tog.1.html @@ -327,6 +327,52 @@ is unique.
+ + +
+

+
+
+
tog shows colorized output if this variable is set + to a non-empty value. The default color scheme can be modified by setting + the environment variables documented below. The colors available in color + schemes are “black”, “red”, + “green”, “yellow”, “blue”, + “megenta”, “cyan”, and “default” + which maps to the terminal's default foreground color.
+
+
The color used to mark up removed lines in diffs. If not set, the default + value “magenta” is used.
+
+
The color used to mark up added lines in diffs. If not set, the default + value “cyan” is used.
+
+
The color used to mark up chunk header lines in diffs. If not set, the + default value “yellow” is used.
+
+
The color used to mark up meta data in diffs. If not set, the default + value “green” is used.
+
+
The color used to mark up sobmodules tree entries. If not set, the default + value “magenta” is used.
+
+
The color used to mark up symbolic link tree entries. If not set, the + default value “cyan” is used.
+
+
The color used to mark up directory tree entries. If not set, the default + value “blue” is used.
+
+
The color used to mark up executable file tree entries. If not set, the + default value “green” is used.
+
+
The color used to mark up commit IDs. If not set, the default value + “green” is used.
+
+
The color used to mark up author information. If not set, the default + value “cyan” is used.
+
+
The color used to mark up date information. If not set, the default value + “yellow” is used.
@@ -352,7 +398,7 @@ - +
October 21, 2019November 27, 2019 OpenBSD 6.6