From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Miklos Vajna" <vmiklos@frugalware.org>
Subject: [PATCH 0/8] merge: allow --log to append shortlog to -m
Date: Tue, 11 May 2010 01:17:44 +0800 [thread overview]
Message-ID: <1273511872-4924-1-git-send-email-rctay89@gmail.com> (raw)
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(-)
next reply other threads:[~2010-05-10 17:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-10 17:17 Tay Ray Chuan [this message]
2010-05-10 17:17 ` [PATCH 1/8] t7604-merge-custom-message: shift expected output creation Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 2/8] t7604-merge-custom-message: show that --log doesn't append to -m Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 3/8] merge: update comment Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 4/8] merge: rename variable Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 5/8] fmt-merge-msg: minor refactor of fmt_merge_msg() Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 6/8] fmt-merge-msg: refactor merge title formatting Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 7/8] fmt-merge-msg: add function to append shortlog only Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 8/8] merge: --log appends shortlog to message if specified Tay Ray Chuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1273511872-4924-1-git-send-email-rctay89@gmail.com \
--to=rctay89@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=vmiklos@frugalware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).