Merge branch 'en/merge-recursive-directory-rename-fixes'

[thirdparty/git.git] / Documentation / config / trace2.txt

diff --git a/Documentation/config/trace2.txt b/Documentation/config/trace2.txt
index 2edbfb02fe5bd3b124bfa625586904409fc2a856..4ce0b9a6d17fdd47d6b3d6cc36ea3ee4ea74cc0f 100644 (file)
--- a/Documentation/config/trace2.txt
+++ b/Documentation/config/trace2.txt
@@ -54,3 +54,9 @@ trace2.destinationDebug::
        By default, these errors are suppressed and tracing is
        silently disabled.  May be overridden by the
        `GIT_TRACE2_DST_DEBUG` environment variable.
+
+trace2.maxFiles::
+       Integer.  When writing trace files to a target directory, do not
+       write additional traces if we would exceed this many files. Instead,
+       write a sentinel file that will block further tracing to this
+       directory. Defaults to 0, which disables this check.