From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 16 Aug 2010 00:12:11 GMT
Subject: Re: [PATCH] reset: Better warning message on git reset --mixed <paths>
Message-ID: <20100816001211.GD3296@burratino>
In-Reply-To: <1281906304.32195.26.camel@lucy.SSG5-Serial-WLAN>

Ralf Ebert wrote:

> git wipe [<path>]            # git reset [<file>]; git checkout [<file>]

git checkout HEAD -- <pathspec>.

So:

repository  ---> index ---> work tree

Limited by paths
================

  r -> i: git reset <rev> -- <pathspec>
  i -> w: git checkout -- <pathspec>
  r -> w: git checkout <rev> -- <pathspec>

Updating head symref
====================

  r -> r: git checkout HEAD^0 && git reset --soft <rev> && git checkout <rev>
  r -> i: git checkout HEAD^0 && git reset --mixed <rev> && git checkout <rev>
  r -> w: git checkout <rev>

Resetting branch tip
====================

  r -> r: git reset --soft <rev>
  r -> i: git reset --mixed <rev>
  r -> w: git reset --hard <rev>

“git checkout --no-update” and “git checkout --no-update --keep-index”
do not sound very useful to me, so I am not suggesting adding them.