diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-09-30 00:04:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-09-30 00:04:34 +0000 |
| commit | 3b4609d029e2db42b5154f019facecee49196bf0 (patch) | |
| tree | 6d059b8455a973760f1680791fbdf8c453fe387e /git-fmt-merge-msg.txt | |
| parent | 442206cbc570d6bc05423bd8a54db5f06d740c65 (diff) | |
| download | git-htmldocs-3b4609d029e2db42b5154f019facecee49196bf0.tar.gz | |
Autogenerated HTML docs for v1.7.3.1-45-g9855
Diffstat (limited to 'git-fmt-merge-msg.txt')
| -rw-r--r-- | git-fmt-merge-msg.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 302f56b88..40dba8c0a 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -9,8 +9,8 @@ git-fmt-merge-msg - Produce a merge commit message SYNOPSIS -------- [verse] -'git fmt-merge-msg' [-m <message>] [--log | --no-log] <$GIT_DIR/FETCH_HEAD -'git fmt-merge-msg' [-m <message>] [--log | --no-log] -F <file> +'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] <$GIT_DIR/FETCH_HEAD +'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file> DESCRIPTION ----------- @@ -24,10 +24,12 @@ automatically invoking 'git merge'. OPTIONS ------- ---log:: +--log[=<n>]:: In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being - merged. + merged. At most <n> commits from each merge parent will be + used (20 if <n> is omitted). This overrides the `merge.log` + configuration variable. --no-log:: Do not list one-line descriptions from the actual commits being @@ -52,8 +54,10 @@ CONFIGURATION ------------- merge.log:: - Whether to include summaries of merged commits in newly - merge commit messages. False by default. + In addition to branch names, populate the log message with at + most the specified number of one-line descriptions from the + actual commits that are being merged. Defaults to false, and + true is a synoym for 20. merge.summary:: Synonym to `merge.log`; this is deprecated and will be removed in |