From: Jared Hance <jaredhance@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] revert: only suggest to commit if not passing -n
Date: Fri, 23 Jul 2010 12:42:18 -0400 [thread overview]
Message-ID: <20100723164218.GA2284@localhost.localdomain> (raw)
In-Reply-To: <1279806692-6762-1-git-send-email-carenas@sajinet.com.pe>
On Thu, Jul 22, 2010 at 06:51:32AM -0700, Carlo Marcelo Arenas Belon wrote:
> strbuf_addstr(&helpbuf, " After resolving the conflicts,\n"
> - "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
> - "and commit the result");
> + "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'");
> + if (!no_commit) {
> + strbuf_addf(&helpbuf, "\nand commit the result");
Shouldn't we use strbuf_addstr here? We aren't using the formatting
part of strbuf_addf.
next prev parent reply other threads:[~2010-07-23 16:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-22 13:51 [PATCH] revert: only suggest to commit if not passing -n Carlo Marcelo Arenas Belon
2010-07-23 16:42 ` Jared Hance [this message]
2010-07-25 12:54 ` [PATCH v2] " Carlo Marcelo Arenas Belon
2010-08-13 4:54 ` Junio C Hamano
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=20100723164218.GA2284@localhost.localdomain \
--to=jaredhance@gmail.com \
--cc=git@vger.kernel.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).