| commit | dbddb714b0e69ef15fba64e74f34244ab95f0610 | |
| author | Jakub Narebski <jnareb@gmail.com> | |
| Thu, 12 Jul 2007 23:54:06 +0000 (13 01:54 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Jul 2007 03:20:49 +0000 (12 20:20 -0700) | ||
| tree | 75d0cd45a5e2b5fd2c1ab2a913bdbcc51302a76e | treesnapshot (tar.gz zip) |
| parent | 7d7baa5e15b9ad6768d782d9bae5badc4e51d4ea | commitdiff |
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>
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>
| Documentation/config.txt | diffblobblamehistory | |
| Documentation/git-merge.txt | diffblobblamehistory | |
| Documentation/git.txt | diffblobblamehistory |