Update git-merge documentation.

Add "Configuration" section to describe merge.summary
configuration variable (which is mentioned in git-fmt-merge-msg(1)
man page, but it is a plumbing command), and merge.verbosity
configuration variable (so there is a place to make reference
from "Environment Variables" section of git(7) man page) to the
git-merge(1) man page.  Also describe GIT_MERGE_VERBOSITY
environment.

The configuration variable merge.verbosity and environment variable
GIT_MERGE_VERBOSITY were introduced in commit 8c3275ab, which also
documented configuration variable but not environment variable.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 11b332117c7abbdf3c4239843672d394578f8f0a..d0e9a175f4c967f03462e92a0357165ddfb45473 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -567,6 +567,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 overriden by 'GIT_MERGE_VERBOSITY' environment variable.
 
 merge.<driver>.name::
        Defines a human readable name for a custom low-level

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index d285cba033325f8652996ea71a06d53c22424dae..2c9db98a3cfa616c09dcfd340dcd022aeb7c91e0 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -43,6 +43,21 @@ If you tried a merge which resulted in a complex conflicts and
 would want to start over, you can recover with
 gitlink:git-reset[1].
 
+CONFIGURATION
+-------------
+
+merge.summary::
+       Whether to include summaries of merged commits in newly
+       created merge commit. False by default.
+
+merge.verbosity::
+       Controls the amount of output shown by the recursive merge
+       strategy.  Level 0 outputs nothing except a final error
+       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 overriden by 'GIT_MERGE_VERBOSITY' environment variable.
+
 
 HOW MERGE WORKS
 ---------------

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 33614ec0502dcbbadb2f067398e8b02af7cec77f..3fbfd45ffedfafc7b4de718e9455e7555aabdbb8 100644 (file)
--- 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`.