Previously, --log didn't have any effect if a message was specified
with -m. This allows one to create commit messages like:
Merge in new feature
* commit c2:
c2's message
Contents:
[PATCH 1/8] t7604-merge-custom-message: shift expected output creation
[PATCH 2/8] t7604-merge-custom-message: show that --log doesn't append to -m
[PATCH 3/8] merge: update comment
[PATCH 4/8] merge: rename variable
[PATCH 5/8] fmt-merge-msg: minor refactor of fmt_merge_msg()
[PATCH 6/8] fmt-merge-msg: refactor merge title formatting
[PATCH 7/8] fmt-merge-msg: add function to append shortlog only
[PATCH 8/8] merge: --log appends shortlog to message if specified
Documentation/git-merge.txt | 7 +++-
builtin.h | 1 +
builtin/fmt-merge-msg.c | 76 ++++++++++++++++++++++++--------------
builtin/merge.c | 20 ++++++----
t/t7604-merge-custom-message.sh | 24 ++++++++++--
5 files changed, 87 insertions(+), 41 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