diff options
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index d285cba033..2c9db98a3c 100644 --- 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 --------------- |