| commit | 6cd9cfefc505ed5ab5ff435ff9ef338ac8721225 | |
| author | SZEDER Gábor <szeder@ira.uka.de> | |
| Sun, 6 Apr 2008 01:23:45 +0000 (6 03:23 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Apr 2008 02:28:18 +0000 (12 19:28 -0700) | ||
| tree | d2afafd297a4ae11479c465e244f1778f02fbdc2 | treesnapshot (tar.gz zip) |
| parent | 3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425 | commitdiff |
fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
These are new synonyms to the '--(no-)summary' option and the
'merge.summary' config variable, but are consistent with the soon to be
added 'merge --(no-)log' options. The 'merge.summary' config variable and
'--(no-)summary' options are still accepted, but are advertised to be
removed in the future.
'merge.log' takes precedence over 'merge.summary' if they are both set
inconsistently.
Update documentation and tests accordingly.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
These are new synonyms to the '--(no-)summary' option and the
'merge.summary' config variable, but are consistent with the soon to be
added 'merge --(no-)log' options. The 'merge.summary' config variable and
'--(no-)summary' options are still accepted, but are advertised to be
removed in the future.
'merge.log' takes precedence over 'merge.summary' if they are both set
inconsistently.
Update documentation and tests accordingly.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-fmt-merge-msg.txt | diffblobblamehistory | |
| Documentation/merge-config.txt | diffblobblamehistory | |
| builtin-fmt-merge-msg.c | diffblobblamehistory | |
| t/t6200-fmt-merge-msg.sh | diffblobblamehistory |