diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-07-13 05:33:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-07-13 05:33:25 +0000 |
| commit | 1e6e00634f257c354c4261ef7da2b8dc495e3c99 (patch) | |
| tree | 88ba4f5d1844a852fb27fee6fa7705fb785c23e2 /git-merge.txt | |
| parent | 235d53f227234a5905682cc55d59adcc6369c48c (diff) | |
| download | git-htmldocs-1e6e00634f257c354c4261ef7da2b8dc495e3c99.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc1-4-gaf83
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/git-merge.txt b/git-merge.txt index d285cba03..2c9db98a3 100644 --- a/git-merge.txt +++ b/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 --------------- |