summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-04-06 01:23:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-13 02:28:18 (GMT)
commit6cd9cfefc505ed5ab5ff435ff9ef338ac8721225 (patch)
treed2afafd297a4ae11479c465e244f1778f02fbdc2 /Documentation/merge-config.txt
parent3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425 (diff)
downloadgit-6cd9cfefc505ed5ab5ff435ff9ef338ac8721225.zip
git-6cd9cfefc505ed5ab5ff435ff9ef338ac8721225.tar.gz
git-6cd9cfefc505ed5ab5ff435ff9ef338ac8721225.tar.bz2
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-config.txt')
-rw-r--r--Documentation/merge-config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 6d0a797..9719311 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -2,7 +2,7 @@ merge.stat::
Whether to print the diffstat berween ORIG_HEAD and merge result
at the end of the merge. True by default.
-merge.summary::
+merge.log::
Whether to include summaries of merged commits in newly created
merge commit messages. False by default.