Re: Git rescue mission
- From
- Kalle Pokki <kalle.pokki@iki.fi>
- Date
- Feb 8, 2007, 22:03 UTC
- Message-ID
- <87bqk4z4qw.fsf@host94.eke.fi>
- In-Reply-To
- <Pine.LNX.4.64.0702081321040.8424@woody.linux-foundation.org>
Linus Torvalds <torvalds@linux-foundation.org> writes:
Show 9 quoted lines
> 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.