@@ -1405,7 +1405,7 @@ <h3 id="_conditional_includes">Conditional includes</h3>
14051405< dl >
14061406< dt class ="hdlist1 "> < code > gitdir</ code > </ dt >
14071407< dd >
1408- < p > The data that follows the keyword < code > gitdir: </ code > is used as a glob
1408+ < p > The data that follows the keyword < code > gitdir</ code > and a colon is used as a glob
14091409pattern. If the location of the .git directory matches the
14101410pattern, the include condition is met.</ p >
14111411< div class ="paragraph ">
@@ -1450,7 +1450,7 @@ <h3 id="_conditional_includes">Conditional includes</h3>
14501450</ dd >
14511451< dt class ="hdlist1 "> < code > onbranch</ code > </ dt >
14521452< dd >
1453- < p > The data that follows the keyword < code > onbranch: </ code > is taken to be a
1453+ < p > The data that follows the keyword < code > onbranch</ code > and a colon is taken to be a
14541454pattern with standard globbing wildcards and two additional
14551455ones, < code > **/</ code > and < code > /**</ code > , that can match multiple path components.
14561456If we are in a worktree where the name of the branch that is
@@ -1464,9 +1464,9 @@ <h3 id="_conditional_includes">Conditional includes</h3>
14641464all the branches in that hierarchy.</ p >
14651465</ div >
14661466</ dd >
1467- < dt class ="hdlist1 "> < code > hasconfig:remote.*.url: </ code > </ dt >
1467+ < dt class ="hdlist1 "> < code > hasconfig:remote.*.url</ code > </ dt >
14681468< dd >
1469- < p > The data that follows this keyword is taken to
1469+ < p > The data that follows this keyword and a colon is taken to
14701470be a pattern with standard globbing wildcards and two
14711471additional ones, < code > **/</ code > and < code > /**</ code > , that can match multiple
14721472components. The first time this keyword is seen, the rest of
@@ -3622,8 +3622,35 @@ <h3 id="_variables">Variables</h3>
36223622commented, and removes them after the editor returns
36233623(default < em > #</ em > ).</ p >
36243624< div class ="paragraph ">
3625- < p > If set to "auto", < code > git-commit</ code > would select a character that is not
3626- the beginning character of any line in existing commit messages.</ p >
3625+ < p > If set to "auto", < code > git-commit</ code > will select a character that is not
3626+ the beginning character of any line in existing commit messages.
3627+ Support for this value is deprecated and will be removed in Git 3.0
3628+ due to the following limitations:</ p >
3629+ </ div >
3630+ < div class ="openblock ">
3631+ < div class ="content ">
3632+ < div class ="ulist ">
3633+ < ul >
3634+ < li >
3635+ < p > It is incompatible with adding comments in a commit message
3636+ template. This includes the conflicts comments added to
3637+ the commit message by < code > cherry-pick</ code > , < code > merge</ code > , < code > rebase</ code > and
3638+ < code > revert</ code > .</ p >
3639+ </ li >
3640+ < li >
3641+ < p > It is incompatible with adding comments to the commit message
3642+ in the < code > prepare-commit-msg</ code > hook.</ p >
3643+ </ li >
3644+ < li >
3645+ < p > It is incompatible with the < code > fixup</ code > and < code > squash</ code > commands when
3646+ rebasing,</ p >
3647+ </ li >
3648+ < li >
3649+ < p > It is not respected by < code > git</ code > < code > notes</ code > </ p >
3650+ </ li >
3651+ </ ul >
3652+ </ div >
3653+ </ div >
36273654</ div >
36283655< div class ="paragraph ">
36293656< p > Note that these two variables are aliases of each other, and in modern
@@ -7601,6 +7628,35 @@ <h3 id="_variables">Variables</h3>
76017628"false", which means the "promisor-remote" capability is not
76027629advertised.</ p >
76037630</ dd >
7631+ < dt class ="hdlist1 "> promisor.sendFields</ dt >
7632+ < dd >
7633+ < p > A comma or space separated list of additional remote related
7634+ field names. A server sends these field names and the
7635+ associated field values from its configuration when
7636+ advertising its promisor remotes using the "promisor-remote"
7637+ capability, see < a href ="gitprotocol-v2.html "> gitprotocol-v2(5)</ a > . Currently, only the
7638+ "partialCloneFilter" and "token" field names are supported.</ p >
7639+ </ dd >
7640+ < dt class ="hdlist1 "> < code > partialCloneFilter</ code > </ dt >
7641+ < dd >
7642+ < p > contains the partial clone filter
7643+ used for the remote.</ p >
7644+ </ dd >
7645+ < dt class ="hdlist1 "> < code > token</ code > </ dt >
7646+ < dd >
7647+ < p > contains an authentication token for the remote.</ p >
7648+ < div class ="paragraph ">
7649+ < p > When a field name is part of this list and a corresponding
7650+ "remote.foo.<field-name>" config variable is set on the server to a
7651+ non-empty value, then the field name and value are sent when
7652+ advertising the promisor remote "foo".</ p >
7653+ </ div >
7654+ < div class ="paragraph ">
7655+ < p > This list has no effect unless the "promisor.advertise" config
7656+ variable is set to "true", and the "name" and "url" fields are always
7657+ advertised regardless of this setting.</ p >
7658+ </ div >
7659+ </ dd >
76047660< dt class ="hdlist1 "> promisor.acceptFromServer</ dt >
76057661< dd >
76067662< p > If set to "all", a client will accept all the promisor remotes
@@ -7622,6 +7678,61 @@ <h3 id="_variables">Variables</h3>
76227678to "fetch" and "clone" requests from the client. Name and URL
76237679comparisons are case sensitive. See < a href ="gitprotocol-v2.html "> gitprotocol-v2(5)</ a > .</ p >
76247680</ dd >
7681+ < dt class ="hdlist1 "> promisor.checkFields</ dt >
7682+ < dd >
7683+ < p > A comma or space separated list of additional remote related
7684+ field names. A client checks if the values of these fields
7685+ transmitted by a server correspond to the values of these
7686+ fields in its own configuration before accepting a promisor
7687+ remote. Currently, "partialCloneFilter" and "token" are the
7688+ only supported field names.</ p >
7689+ < div class ="paragraph ">
7690+ < p > If one of these field names (e.g., "token") is being checked for an
7691+ advertised promisor remote (e.g., "foo"), three conditions must be met
7692+ for the check of this specific field to pass:</ p >
7693+ </ div >
7694+ < div class ="olist arabic ">
7695+ < ol class ="arabic ">
7696+ < li >
7697+ < p > The corresponding local configuration (e.g., < code > remote.foo.token</ code > )
7698+ must be set.</ p >
7699+ </ li >
7700+ < li >
7701+ < p > The server must advertise the "token" field for remote "foo".</ p >
7702+ </ li >
7703+ < li >
7704+ < p > The value of the locally configured < code > remote.foo.token</ code > must exactly
7705+ match the value advertised by the server for the "token" field.</ p >
7706+ < div class ="paragraph ">
7707+ < p > If any of these conditions is not met for any field name listed in
7708+ < code > promisor.checkFields</ code > , the advertised remote "foo" is rejected.</ p >
7709+ </ div >
7710+ < div class ="paragraph ">
7711+ < p > For the "partialCloneFilter" field, this allows the client to ensure
7712+ that the server’s filter matches what it expects locally, preventing
7713+ inconsistencies in filtering behavior. For the "token" field, this can
7714+ be used to verify that authentication credentials match expected
7715+ values.</ p >
7716+ </ div >
7717+ < div class ="paragraph ">
7718+ < p > Field values are compared case-sensitively.</ p >
7719+ </ div >
7720+ < div class ="paragraph ">
7721+ < p > The "name" and "url" fields are always checked according to the
7722+ < code > promisor.acceptFromServer</ code > policy, independently of this setting.</ p >
7723+ </ div >
7724+ < div class ="paragraph ">
7725+ < p > The field names and values should be passed by the server through the
7726+ "promisor-remote" capability by using the < code > promisor.sendFields</ code > config
7727+ variable. The fields are checked only if the
7728+ < code > promisor.acceptFromServer</ code > config variable is not set to "None". If
7729+ set to "None", this config variable has no effect. See
7730+ < a href ="gitprotocol-v2.html "> gitprotocol-v2(5)</ a > .</ p >
7731+ </ div >
7732+ </ li >
7733+ </ ol >
7734+ </ div >
7735+ </ dd >
76257736< dt class ="hdlist1 "> protocol.allow</ dt >
76267737< dd >
76277738< p > If set, provide a user defined default policy for all protocols which
@@ -8705,6 +8816,8 @@ <h3 id="_variables">Variables</h3>
87058816< dt class ="hdlist1 "> sendemail.smtpServerPort</ dt >
87068817< dt class ="hdlist1 "> sendemail.smtpServerOption</ dt >
87078818< dt class ="hdlist1 "> sendemail.smtpUser</ dt >
8819+ < dt class ="hdlist1 "> sendemail.imapSentFolder</ dt >
8820+ < dt class ="hdlist1 "> sendemail.useImapOnly</ dt >
87088821< dt class ="hdlist1 "> sendemail.thread</ dt >
87098822< dt class ="hdlist1 "> sendemail.transferEncoding</ dt >
87108823< dt class ="hdlist1 "> sendemail.validate</ dt >
0 commit comments