From: Jared Hance <jaredhance@gmail.com>
Date: Fri, 23 Jul 2010 16:42:18 GMT
Subject: Re: [PATCH] revert: only suggest to commit if not passing -n
Message-ID: <20100723164218.GA2284@localhost.localdomain>
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.