diff options
Diffstat (limited to 'man1/git-config.1')
| -rw-r--r-- | man1/git-config.1 | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/man1/git-config.1 b/man1/git-config.1 index 016780f8d..495e82104 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,12 +2,12 @@ .\" Title: git-config .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CONFIG" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1022,7 +1022,7 @@ Files included by this option (directly or indirectly) are not allowed to contai .sp Note that unlike other includeIf conditions, resolving this condition relies on information that is not yet known at the point of reading the condition\&. A typical use case is this option being present as a system\-level or global\-level config, and the remote URL being in a local\-level config; hence the need to scan ahead when resolving this condition\&. In order to avoid the chicken\-and\-egg problem in which potentially\-included files can affect whether such files are potentially included, Git breaks the cycle by prohibiting these files from affecting the resolution of these conditions (thus, prohibiting them from declaring remote URLs)\&. .sp -As for the naming of this keyword, it is for forwards compatibiliy with a naming scheme that supports more variable\-based include conditions, but currently Git only supports the exact keyword described above\&. +As for the naming of this keyword, it is for forwards compatibility with a naming scheme that supports more variable\-based include conditions, but currently Git only supports the exact keyword described above\&. .RE .sp A few more notes on matching via \fBgitdir\fR and \fBgitdir/i\fR: @@ -1525,6 +1525,11 @@ diverging .RS 4 Advice shown when a fast\-forward is not possible\&. .RE +.PP +worktreeAddOrphan +.RS 4 +Advice shown when a user tries to create a worktree from an invalid reference, to instruct how to create a new orphan branch instead\&. +.RE .RE .PP core\&.fileMode @@ -4382,6 +4387,18 @@ Enable config options that are new to Git, and are being considered for future d \fBfetch\&.negotiationAlgorithm=skipping\fR may improve fetch negotiation times by skipping more commits at a time, reducing the number of round trips\&. .RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBpack\&.useBitmapBoundaryTraversal=true\fR +may improve bitmap traversal times by walking fewer objects\&. +.RE .RE .PP feature\&.manyFiles @@ -5111,6 +5128,13 @@ and are the commits prior to the amend or rebase occurring\&. Since these change \fBgc\&.reflogExpire\fR\&. .RE .PP +gc\&.recentObjectsHook +.RS 4 +When considering whether or not to remove an object (either when generating a cruft pack or storing unreachable objects as loose), use the shell to execute the specified command(s)\&. Interpret their output as object IDs which Git will consider as "recent", regardless of their age\&. By treating their mtimes as "now", any objects (and their descendants) mentioned in the output will be kept regardless of their true age\&. +.sp +Output must contain exactly one hex object ID per line, and nothing else\&. Objects which cannot be found in the repository are ignored\&. Multiple hooks are supported, but all must exit successfully, else the operation (either generating a cruft pack or unpacking unreachable objects) will be halted\&. +.RE +.PP gc\&.rerereResolved .RS 4 Records of conflicted merge you resolved earlier are kept for this many days when @@ -7427,6 +7451,15 @@ pack\&.useBitmaps When true, git will use pack bitmaps (if available) when packing to stdout (e\&.g\&., during the server side of a fetch)\&. Defaults to true\&. You should not generally need to turn this off unless you are debugging pack bitmaps\&. .RE .PP +pack\&.useBitmapBoundaryTraversal +.RS 4 +When true, Git will use an experimental algorithm for computing reachability queries with bitmaps\&. Instead of building up complete bitmaps for all of the negated tips and then OR\-ing them together, consider negated tips with existing bitmaps as additive (i\&.e\&. OR\-ing them into the result if they exist, ignoring them otherwise), and build up a bitmap at the boundary instead\&. +.sp +When using this algorithm, Git may include too many objects as a result of not opening up trees belonging to certain UNINTERESTING commits\&. This inexactness matches the non\-bitmap traversal algorithm\&. +.sp +In many cases, this can provide a speed\-up over the exact algorithm, particularly when there is poor bitmap coverage of the negated side of the query\&. +.RE +.PP pack\&.useSparse .RS 4 When true, git will default to using the |