From: Jon Loeliger <jdl@freescale.com>
Date: Thu, 26 Jun 2008 16:15:03 GMT
Subject: Re: [PATCH] cmd_reset: don't trash uncommitted changes unless told to
Message-ID: <4863C087.1070304@freescale.com>
In-Reply-To: <486329C9.8020801@op5.se>

Andreas Ericsson wrote:

> There is a "--hard" after one of them. It reads like this:
> 
> git reset --hard  ;# move current branch to random point in history
>                   # discarding working tree and index state
> 
> git reset --mixed ;# move current branch to random point in history
>                   # discard the index but keep the working tree
> 
> git reset --soft  ;# move current branch to random point in history,
>                   # leaving index and working tree intact

I always thought that these would be best presented in
a linear ordering so that the effects were clearly
shown in an "increasing" way:

--soft
    - touches one thing

--mixed
    - touches one thing and a second
    - this is the default

--hard
    - touches one thing, a second and a third

Want a patch down that line?

jdl