commit 15ba834966c48f744a1c2ae977e19a8a159eb91a from: Stefan Sperling date: Sun Apr 24 13:26:57 2022 UTC sync man pages commit - cd0b92eee3b303ffbe89e311f4ab6d00745152e8 commit + 15ba834966c48f744a1c2ae977e19a8a159eb91a blob - cf188c6c5b1a0bd9364616b8ccbcff8f440ae4f4 blob + ccf3c8db02299dc0aa1b21631d7340953f76c7b6 --- git-repository.5.html +++ git-repository.5.html @@ -209,8 +209,8 @@ - - + +
March 23, 2022OpenBSD 7.0April 24, 2022OpenBSD 7.1
blob - ac5033a2f55810657d78797d1095a899426ff2bc blob + 4c4440698295f59a60a8f5407c9cf031a24d952e --- got-worktree.5.html +++ got-worktree.5.html @@ -182,8 +182,8 @@ - - + +
March 23, 2022OpenBSD 7.0April 24, 2022OpenBSD 7.1
blob - e131e3561f8776532def2203c460cd21688b31d1 blob + 653bc8db055c4c03fde22442d6fd8f6a918e2ef0 --- got.1.html +++ got.1.html @@ -1209,7 +1209,9 @@
- [-n] [patchfile]
+ [-n] [-p + strip-count] [-R] + [patchfile]
(alias: pa)
@@ -1267,6 +1269,16 @@ check whether a patch would apply without issues. If the patchfile contains diffs that affect the same file multiple times, the results displayed may be incorrect.
+
+ strip-count
+
Specify the number of leading path components to strip from paths + parsed from patchfile. If the + -p option is not used, ‘a/’ and + ‘b/’ path prefixes generated by + git-diff(1) will be recognized and stripped + automatically.
+
+
Reverse the patch before applying it.
@@ -1286,7 +1298,7 @@

The options for got revert are as follows:

-
+
Instead of reverting all changes in files, interactively select or reject changes to revert based on “y” (revert change), “n” (keep change), and “q” (quit reverting @@ -1300,7 +1312,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.
@@ -2235,7 +2247,7 @@ along with the IDs of staged blob objects and stage status codes. If paths were provided on the command line, show the staged paths among the specified paths. Otherwise, show all staged paths. -
+
Instead of staging the entire content of a changed file, interactively select or reject changes for staging based on “y” (stage change), “n” (reject change), and “q” @@ -2316,7 +2328,7 @@

The options for got unstage are as follows:

-
+
Instead of unstaging the entire content of a changed file, interactively select or reject changes for unstaging based on “y” (unstage change), “n” (keep change @@ -2753,8 +2765,8 @@ - - + +
March 23, 2022OpenBSD 7.0April 24, 2022OpenBSD 7.1
blob - 698ff9a23ac68665952a0716ce777bdd95a8c2d2 blob + 3d96540c9350b3e6c63c88d334d5a99acf47bcaf --- got.conf.5.html +++ got.conf.5.html @@ -267,8 +267,8 @@ - - + +
March 23, 2022OpenBSD 7.0April 24, 2022OpenBSD 7.1
blob - 89873b032a7bc0a00e1c61cbf2311fdde52163d6 blob + 5778950cb2c9ec57812b269b6b28bcb900619bb0 --- gotadmin.1.html +++ gotadmin.1.html @@ -87,7 +87,8 @@
[-a] [-r repository-path] [-x - reference] [reference ...]
+ reference] [-q] + [reference ...]
Generate a new pack file and a corresponding pack file index. By default, add any loose objects which are reachable via any references to the generated pack file. @@ -126,6 +127,8 @@ appears in both the included and excluded lists, it will be excluded.

+
+
Suppress progress reporting output.
@@ -251,7 +254,7 @@ repository is located at or above the current working directory. If this directory is a got(1) work tree, use the repository path associated with this work tree. -
+
Suppress progress reporting and disk space summary output.
@@ -304,8 +307,8 @@ - - + +
March 23, 2022OpenBSD 7.0April 24, 2022OpenBSD 7.1
blob - 85bce51f83663e019192f508845f9313ef1bb7d5 blob + 3dafa922b2d7b2f9f8ef5a17a0afffe256c9ba9f --- gotweb.8.html +++ gotweb.8.html @@ -145,8 +145,8 @@ - - + +
March 23, 2022OpenBSD 7.0April 24, 2022OpenBSD 7.1
blob - ed26b14133cfc35673bec760d3e0b72963460930 blob + a2fce3d1d8f24c2b083456fdd6741f998d0ee66a --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -161,8 +161,8 @@ got_logo_url "https://gameoftrees.org" - - + +
March 23, 2022OpenBSD 7.0April 24, 2022OpenBSD 7.1
blob - 2e5f5b12e2bfa0dbbc3921e9f18428362894d5e8 blob + 39eb5ca29a75dbb11cee461d698c7a9ca3fa8267 --- tog.1.html +++ tog.1.html @@ -592,8 +592,8 @@ - - + +
March 23, 2022OpenBSD 7.0April 24, 2022OpenBSD 7.1