undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update git-merge documentation.

Browse Source 
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>
This commit is contained in:
Jakub Narebski 2007-07-13 01:54:06 +02:00 committed by Junio C Hamano
parent 7d7baa5e15
commit dbddb714b0
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/config.txt
View File

@ -567,6 +567,7 @@ merge.verbosity::
message if conflicts were detected. Level 1 outputs only message if conflicts were detected. Level 1 outputs only
conflicts, 2 outputs conflicts and file changes. Level 5 and conflicts, 2 outputs conflicts and file changes. Level 5 and
above outputs debugging information. The default is level 2. above outputs debugging information. The default is level 2.
Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
merge.<driver>.name:: merge.<driver>.name::
Defines a human readable name for a custom low-level Defines a human readable name for a custom low-level

15
Documentation/git-merge.txt
View File

@ -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 would want to start over, you can recover with
gitlink:git-reset[1]. 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 HOW MERGE WORKS
--------------- ---------------

5
Documentation/git.txt
View File

@ -411,6 +411,11 @@ parameter, <path>.
other 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':: 'GIT_PAGER'::
This environment variable overrides `$PAGER`. This environment variable overrides `$PAGER`.