cleanup unpack-trees.c: shrink struct tree_entry_list

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 33614ec0502dcbbadb2f067398e8b02af7cec77f..4c4d1746e03bdf47959ba58335785974d20efdee 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -411,8 +411,15 @@ parameter, <path>.
 
 other
 ~~~~~
+'GIT_MERGE_VERBOSITY'::
+       A number controlling the amount of output shown by
+       the recursive merge strategy.  Overrides merge.verbosity.
+       See gitlink:git-merge[1]
+
 'GIT_PAGER'::
-       This environment variable overrides `$PAGER`.
+       This environment variable overrides `$PAGER`. If it is set
+       to an empty string or to the value "cat", git will not launch
+       a pager.
 
 'GIT_FLUSH'::
        If this environment variable is set to "1", then commands such