merge-trees: let caller decide whether to renormalize

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9f1c785b7e5e5fdebeaf6fa0425659697c51c19b..4c491045c9fa8fba7e154af85686557598e90320 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -889,6 +889,12 @@ format.subjectprefix::
        The default for format-patch is to output files with the '[PATCH]'
        subject prefix. Use this variable to change that prefix.
 
+format.signature::
+       The default for format-patch is to output a signature containing
+       the git version number. Use this variable to change that default.
+       Set this variable to the empty string ("") to suppress
+       signature generation.
+
 format.suffix::
        The default for format-patch is to output files with the suffix
        `.patch`. Use this variable to change that suffix (make sure to