Re: bad git pull

From: Nicolas Pitre <nico@cam.org>
Date: Dec 17, 2005, 21:04 UTC
Message-ID: <Pine.LNX.4.64.0512171601430.26663@localhost.localdomain>
In-Reply-To: <7v4q582htm.fsf@assigned-by-dhcp.cox.net>

On Sat, 17 Dec 2005, Junio C Hamano wrote:

Show 11 quoted lines

> Linus Torvalds <torvalds@osdl.org> writes:
> 
> > That said, I think a lot of newbies might want to have a "git undo", and 
> > not because of any BK history. Even if it just ends up being nothing but 
> > shorthand for "git reset --hard ORIG_HEAD".
> 
> I agree to this in principle, but I am afraid "git undo" is too
> generic and fuzzy a term.  Things you might possibly want to
> undo depends on what you did last [*1*].  In most undoable
> cases, "reset --hard" is almost right but most likely would
> result in information loss.

One observation is that ORIG_HEAD should probably be named PREV_HEAD in such context to make it more obvious what it is about.

Nicolas