diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2007-07-13 01:54:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-12 20:20:49 -0700 |
| commit | dbddb714b0e69ef15fba64e74f34244ab95f0610 (patch) | |
| tree | 75d0cd45a5e2b5fd2c1ab2a913bdbcc51302a76e | |
| parent | 7d7baa5e15b9ad6768d782d9bae5badc4e51d4ea (diff) | |
| download | git-dbddb714b0e69ef15fba64e74f34244ab95f0610.tar.gz git-dbddb714b0e69ef15fba64e74f34244ab95f0610.tar.xz | |
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>
| -rw-r--r-- | Documentation/config.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-merge.txt | 15 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 |
3 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 11b332117..d0e9a175f 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 diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index d285cba03..2c9db98a3 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 --------------- diff --git a/Documentation/git.txt b/Documentation/git.txt index 33614ec05..3fbfd45ff 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`. |