diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:48:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:48:20 -0700 |
| commit | 02ef0ed7102a197e2b746f3e694c09915fa98060 (patch) | |
| tree | 3e703ac528c01b7c964a0022185e14071cfb1c40 /Documentation/merge-config.txt | |
| parent | 2851e8eba52e98d3112417952a24d82ae9d8c0eb (diff) | |
| parent | bd2549ca6b0b2d897e073bbaa34c1fee46acd8f0 (diff) | |
| download | git-02ef0ed7102a197e2b746f3e694c09915fa98060.tar.gz git-02ef0ed7102a197e2b746f3e694c09915fa98060.tar.xz | |
Merge branch 'rr/fmt-merge-msg'
* rr/fmt-merge-msg:
t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
merge: Make 'merge.log' an integer or boolean option
merge: Make '--log' an integer option for number of shortlog entries
fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
Conflicts:
builtin/merge.c
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index b72f53397..92772e7c4 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -7,8 +7,10 @@ merge.conflictstyle:: marker and the original text before the `=======` marker. merge.log:: - Whether to include summaries of merged commits in newly created - 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.renameLimit:: The number of files to consider when performing rename detection |