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.
--
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