From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Fri, 06 May 2011 18:40:04 GMT
Subject: Re: [PATCH v2] status: display "doing what" information in git status
Message-ID: <vpqei4bwu4b.fsf@bauges.imag.fr>
In-Reply-To: <1304667535-4787-1-git-send-email-madcoder@debian.org>

Pierre Habouzit <madcoder@debian.org> writes:

> +	const char * const merge_advice =
> +		_("use \"git reset --hard\" to abort, or resolve conflicts and commit");

I think that should be "git reset --merge" (which preserves files not
touched by the merge, and makes sure "git merge; git reset" doesn't
permanently loose data).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/