From: Nguyen Thai Ngoc Duy Date: Sat, 02 Apr 2011 08:43:44 GMT Subject: Re: [PATCH] reset: update help text Message-ID: In-Reply-To: <20110331184246.GA19264@elie> On Fri, Apr 1, 2011 at 1:42 AM, Jonathan Nieder wrote: > Nguyen Thai Ngoc Duy wrote: > >> To be honest, I have no idea what the above describes. I read 9bc454d >> (reset: add option "--keep" to "git reset" - 2010-01-19) and figured >> that --keep is like --merge except that "git diff" before and after >> the reset is exactly the same, is it? I have never used --keep before. > > I use "git reset --keep" to > >  - discard a bad commit: git reset --keep HEAD^ >  - start working against a different commit: > >        git checkout -b topic && >        ... hack hack hack without committing ... && >        : "oops, I thought I was on master but I was somewhere else" && >        git reset --keep master > > .. Thanks. Your changes make sense to me now. -- Duy