From dbddb714b0e69ef15fba64e74f34244ab95f0610 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Fri, 13 Jul 2007 01:54:06 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Documentation/git.txt') diff --git a/Documentation/git.txt b/Documentation/git.txt index 33614ec050..3fbfd45ffe 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -411,6 +411,11 @@ parameter, . 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`. -- cgit v1.2.3