On Fri, Apr 1, 2011 at 1:42 AM, Jonathan Nieder <jrnieder@xxxxxxxxx> 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 -- 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