The documentation of 'git merge' says the following:
--summary
Show a diffstat at the end of the merge. The diffstat is also
controlled by the configuration option merge.diffstat.
-n, --no-summary
Do not show diffstat at the end of the merge.
and
merge.summary
Whether to include summaries of merged commits in newly created
merge commit. False by default.
So the '--summary' option controls the printing of diffstat, while the
'merge.summary' config variable controls the behaviour of 'fmt-merge-msg',
and '--summary' and 'merge.diffstat' are controlling the same thing. This
is inconsistent and quite confusing. In fact, it took me quite a while to
figure out, how Junio generates those nice merge commit messages, as I
have never actually read the meaning of 'merge.summary', thinking that it
must do the same as '--summary'.
These two patches will resolve this issue.
Best,
Gábor
SZEDER Gábor (2):
merge, pull: rename '--summary' option to '--diffstat'
merge, pull: add option to put summary into the merge commit message
Documentation/git-merge.txt | 2 +-
Documentation/merge-options.txt | 13 +++++++++++--
contrib/completion/git-completion.bash | 3 ++-
git-merge.sh | 18 +++++++++++++-----
git-pull.sh | 24 ++++++++++++++----------
t/t7600-merge.sh | 22 ++++++++++++++++++----
6 files changed, 59 insertions(+), 23 deletions(-)
--
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
