Re: [PATCH v2] status: display "doing what" information in git status

Pierre Habouzit [off-list ref] writes:

On Fri, May 06, 2011 at 08:40:04PM +0200, Matthieu Moy wrote:

quoted

Pierre Habouzit [off-list ref] writes:

quoted

+	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 :)

Actually, there's very few reason to run "git reset --hard" these days,
and we should really consider it as a very dangerous command that should
not be advertized to beginners. There's almost always a safer
alternative:

* You want to cancel a merge => git reset --merge
  (doesn't touch files not impacted by merges)

* You want to change the commit your HEAD points to => git reset --keep
  (in case you have local changes, they won't be overridden)

* You want to discard local changes => git stash
  (you may not think these changes are important, but you may be wrong)

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