The documentation did not format well. Tentatively I added the
attached fix-up on top of the series before merging to 'pu'.
* The wildcard in "fsck.*" and "receive.fsck.*" may have made sense
back in v1 when the variables are unbounded set, but v2 fixes it
and we now have a known fixed set of variables, so lets list them
explicitly (this is not a "fix to unbreak formatting").
* The "--" that is not closed was giving me this:
asciidoc: ERROR: git-config.txt: line 413: section title not permitted in delimited block
asciidoc: ERROR: config.txt: line 2414: [blockdef-open] missing closing delimiter
make: *** [git-config.xml] Error 1
(this is "workaround to unbreak formatting"; I didn't check the
actual output closely).
* the line that begins with "- missing email" after indent was
taken as an bulletted item or something, so I rewrapped the
paragraph somewhat to avoid having the dash at the beginning.
Documentation/config.txt | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6718578..aae66bb 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1208,7 +1208,9 @@ filter.<driver>.smudge::
object to a worktree file upon checkout. See
linkgit:gitattributes[5] for details.
-fsck.*::
+fsck.error::
+fsck.warn::
+fsck.ignore::
The `fsck.error`, `fsck.warn` and `fsck.ignore` settings specify
comma-separated lists of fsck message IDs which should trigger
fsck to error out, to print the message and continue, or to ignore
@@ -2138,25 +2140,26 @@ receive.fsckObjects::
Defaults to false. If not set, the value of `transfer.fsckObjects`
is used instead.
-receive.fsck.*::
+receive.fsck.error::
+receive.fsck.warn::
+receive.fsck.ignore::
When `receive.fsckObjects` is set to true, errors can be switched
to warnings and vice versa by configuring the `receive.fsck.*`
settings. These settings contain comma-separated lists of fsck
message IDs. For convenience, fsck prefixes the error/warning with
- the message ID, e.g. "missing-email: invalid author/committer line
- - missing email" means that setting `receive.fsck.ignore =
- missing-email` will hide that issue.
-+
---
- error::
- a comma-separated list of fsck message IDs that should be
- trigger fsck to error out.
- warn::
- a comma-separated list of fsck message IDs that should be
- displayed, but fsck should continue to error out.
- ignore::
- a comma-separated list of fsck message IDs that should be
- ignored completely.
+ the message ID, e.g. "missing-email: invalid
+ author/committer line - missing email" means that setting
+ `receive.fsck.ignore = missing-email` will hide that issue.
++
+error;;
+ a comma-separated list of fsck message IDs that should be
+ trigger fsck to error out.
+warn;;
+ a comma-separated list of fsck message IDs that should be
+ displayed, but fsck should continue to error out.
+ignore;;
+ a comma-separated list of fsck message IDs that should be
+ ignored completely.
+
This feature is intended to support working with legacy repositories
which would not pass pushing when `receive.fsckObjects = true`, allowing
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html