@matheusbsbs / matheus-bagliano / commits / dbddb714b0
Fork 0

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>

Jakub Narebski committed Jul 13, 2007 at 01:54 UTC dbddb714b0e69ef15fba64e74f34244ab95f0610
3 files changed +21
Documentation/config.txt
+1
@@ -567,6 +567,7 @@ merge.verbosity::
567 message if conflicts were detected. Level 1 outputs only
568 conflicts, 2 outputs conflicts and file changes. Level 5 and
569 above outputs debugging information. The default is level 2.
570 + Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
571
572 merge.<driver>.name::
573 Defines a human readable name for a custom low-level
Documentation/git-merge.txt
+15
@@ -43,6 +43,21 @@ If you tried a merge which resulted in a complex conflicts and
43 would want to start over, you can recover with
44 gitlink:git-reset[1].
45
46 +CONFIGURATION
47 +-------------
48 +
49 +merge.summary::
50 + Whether to include summaries of merged commits in newly
51 + created merge commit. False by default.
52 +
53 +merge.verbosity::
54 + Controls the amount of output shown by the recursive merge
55 + strategy. Level 0 outputs nothing except a final error
56 + message if conflicts were detected. Level 1 outputs only
57 + conflicts, 2 outputs conflicts and file changes. Level 5 and
58 + above outputs debugging information. The default is level 2.
59 + Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
60 +
61
62 HOW MERGE WORKS
63 ---------------
Documentation/git.txt
+5
@@ -411,6 +411,11 @@ parameter, <path>.
411
412 other
413 ~~~~~
414 +'GIT_MERGE_VERBOSITY'::
415 + A number controlling the amount of output shown by
416 + the recursive merge strategy. Overrides merge.verbosity.
417 + See gitlink:git-merge[1]
418 +
419 'GIT_PAGER'::
420 This environment variable overrides `$PAGER`.
421