Linus Torvalds <torvalds@linux-foundation.org> writes:

quoted text
> On Thu, 8 Feb 2007, Kalle Pokki wrote:
> > 
> > I usually undo a pull by throwing away just the merge commit by
> > 
> >         git reset --hard HEAD^
> 
> Don't do this.
> 
> If the merge just fast-forwarded, you'll do the wrong thing.

Yes, I know. But when looking at the history with gitk, it feels
quite intuitive to just get rid of the one new commit that appeared
on top of the "good" history. Without that kind of visualisation
I would surely always just use ORIG_HEAD as a reference.

Perhaps gitk could (optionally) also show ORIG_HEAD. That way we could
just do

        gitk --all

after a pull and see what got pulled, and everything else was already
there, too, if needed.
-
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