summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2007-07-12 23:54:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-13 03:20:49 (GMT)
commitdbddb714b0e69ef15fba64e74f34244ab95f0610 (patch)
tree75d0cd45a5e2b5fd2c1ab2a913bdbcc51302a76e /Documentation/git-merge.txt
parent7d7baa5e15b9ad6768d782d9bae5badc4e51d4ea (diff)
downloadgit-dbddb714b0e69ef15fba64e74f34244ab95f0610.zip
git-dbddb714b0e69ef15fba64e74f34244ab95f0610.tar.gz
git-dbddb714b0e69ef15fba64e74f34244ab95f0610.tar.bz2
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>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt15
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index d285cba..2c9db98 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
---------------