diff options
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 11b332117c..d0e9a175f4 100644 --- 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 |