diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2007-07-13 01:54:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-12 20:20:49 -0700 |
| commit | dbddb714b0e69ef15fba64e74f34244ab95f0610 (patch) | |
| tree | 75d0cd45a5e2b5fd2c1ab2a913bdbcc51302a76e /commit.c | |
| parent | Pack-objects: properly initialize the depth value (diff) | |
| download | git-dbddb714b0e69ef15fba64e74f34244ab95f0610.tar.gz git-dbddb714b0e69ef15fba64e74f34244ab95f0610.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions