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 3/8] merge: update comment
Date: Tue, 11 May 2010 01:17:47 +0800 [thread overview]
Message-ID: <1273511872-4924-4-git-send-email-rctay89@gmail.com> (raw)
In-Reply-To: <1273511872-4924-1-git-send-email-rctay89@gmail.com>
ce9d823 (merge: do not add standard message when message is given with
-m option) changed the behaviour of the code that the comment addressed,
but the comment was not similarly updated.
Fix this.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
builtin/merge.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 37d414b..c2691e8 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -990,7 +990,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
/*
* All the rest are the commits being merged;
* prepare the standard merge summary message to
- * be appended to the given message. If remote
+ * used as the merge message. If remote
* is invalid we will die later in the common
* codepath so we discard the error in this
* loop.
--
1.7.1.189.g07419
next prev parent 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 [PATCH 0/8] merge: allow --log to append shortlog to -m Tay Ray Chuan
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 ` Tay Ray Chuan [this message]
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-4-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).