From: Junio C Hamano Date: Fri, 16 Oct 2009 19:05:38 GMT Subject: Re: [PATCH] Proof-of-concept patch to remember what the detached HEAD was Message-ID: <7vvdiftb0d.fsf@alter.siamese.dyndns.org> In-Reply-To: Julian Phillips 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.