From git Fri May 06 18:44:03 2011 From: Pierre Habouzit Date: Fri, 06 May 2011 18:44:03 +0000 To: git Subject: Re: [PATCH v2] status: display "doing what" information in git status Message-Id: <20110506184403.GC2872 () madism ! org> X-MARC-Message: https://marc.info/?l=git&m=130470744803441 On Fri, May 06, 2011 at 08:40:04PM +0200, Matthieu Moy wrote: > Pierre Habouzit 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). Wow, I didn't know about that one, so /maybe/ the hint isn't that useless after all :) -- ·O· Pierre Habouzit ··O madcoder@debian.org OOO http://www.madism.org -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html