diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-04-06 03:23:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:28:18 -0700 |
| commit | 6cd9cfefc505ed5ab5ff435ff9ef338ac8721225 (patch) | |
| tree | d2afafd297a4ae11479c465e244f1778f02fbdc2 /Documentation/merge-options.txt | |
| parent | 3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425 (diff) | |
| download | git-6cd9cfefc505ed5ab5ff435ff9ef338ac8721225.tar.gz git-6cd9cfefc505ed5ab5ff435ff9ef338ac8721225.tar.xz | |
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>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions