On Fri, 16 Oct 2009, Junio C Hamano wrote:
Julian Phillips <julian@xxxxxxxxxxxxxxxxx> writes:
And such uncommitted changes would be lost in the big "undo the fetch
update" diff. So you'd have to do:
git reset --soft HEAD@{1}
git checkout --merge HEAD@{1}
to keep them, while updating to the new state of the remote tracking
branch. Not quite intuitive, is it?
I don't care what git has to do, I'm talking about the user experience
But Bj?rn is showing two commands the _user_ has to type, iow, the comment
is about the user experience.
Only Currently. My point was that _if_ we wanted to support this sort of
thing, then we can make is simpler to do by providing a simple command for
the user.
The point I wanted to make was that the decision on what to do should be
driven by the user's experience - not by the fact that it is easier to
implement something else.
My interest in this thread is solely that it might provide a mechanism to
find out which tag was checked out. So, I'm just chucking in my $0.02 as
a user. My suggestions are probably complete rubbish, as I haven't really
had time to think them through... Sorry.
--
Julian
---
Look, just gimme some inner peace, or I'll mop the floor with ya!
-- Homer Simpson
El Viaje Misterioso de Nuestro Homer
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html