From: Sverre Rabbelier <srabbelier@gmail.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Dale Rowley <ddrowley@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Improve error message in rebase conflict
Date: Sun, 30 May 2010 14:44:52 +0200 [thread overview]
Message-ID: <AANLkTimiZlampV3xmfCyIhb1wbCUpGGYxtZpEYnmHIr1@mail.gmail.com> (raw)
In-Reply-To: <1275222044-511-1-git-send-email-artagnon@gmail.com>
Heya,
On Sun, May 30, 2010 at 14:20, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
> git diff-files --quiet --ignore-submodules || {
> - echo "You must edit all merge conflicts and then"
> - echo "mark them as resolved using git add"
> + echo "You must edit all merge conflicts and then" \
> + "mark them as resolved using 'git add'"
Why is this change not described in the commit message? :)
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2010-05-30 12:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-30 12:20 [PATCH] Improve error message in rebase conflict Ramkumar Ramachandra
2010-05-30 12:44 ` Sverre Rabbelier [this message]
2010-05-30 13:35 ` Ramkumar Ramachandra
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=AANLkTimiZlampV3xmfCyIhb1wbCUpGGYxtZpEYnmHIr1@mail.gmail.com \
--to=srabbelier@gmail.com \
--cc=artagnon@gmail.com \
--cc=ddrowley@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).