tempfile: release deactivated strbufs instead of resetting

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 8a0e52f8ee64564ba1dcac63fc91cdef075996a7..df3ea3779be369ce0f935cfac945e79f08ff4b5a 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -26,11 +26,7 @@ merge.ff::
        allowed (equivalent to giving the `--ff-only` option from the
        command line).
 
-merge.log::
-       In addition to branch names, populate the log message with at
-       most the specified number of one-line descriptions from the
-       actual commits that are being merged.  Defaults to false, and
-       true is a synonym for 20.
+include::fmt-merge-msg-config.txt[]
 
 merge.renameLimit::
        The number of files to consider when performing rename detection
@@ -65,7 +61,7 @@ merge.verbosity::
        message if conflicts were detected. Level 1 outputs only
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.
-       Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable.
+       Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable.
 
 merge.<driver>.name::
        Defines a human-readable name for a custom low-level