Signed-off-by: SZEDER Gábor <szeder@xxxxxxxxxx> --- Documentation/merge-config.txt | 4 +++- Documentation/merge-options.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index a0f71e6..5000162 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -1,8 +1,10 @@ merge.stat:: -merge.diffstat:: Whether to print the diffstat berween ORIG_HEAD and merge result at the end of the merge. True by default. +merge.diffstat:: + Deprecated equivalent of merge.stat. + merge.log:: merge.summary:: Whether to include summaries of merged commits in newly created diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index d0a2ac9..f282556 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -1,7 +1,7 @@ --stat:: Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat (and the - equivalent merge.diffstat). + deprecated merge.diffstat). -n, \--no-stat:: Do not show diffstat at the end of the merge. -- 1.5.5.76.g546c -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
