summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 33614ec050..3fbfd45ffe 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -411,6 +411,11 @@ 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`.