Re: How make "git checkout <commit> <file>" *not* alter index?

chris@seberino.org writes:

The command to reset the index can be used any time you have unwanted changes to it and pretend you started from the latest commit (aka HEAD).

Typically, you use it to recover from a "git add" you did by mistake, e.g.

    $ edit frotz.c nitfol.c
    $ git add frotz.c nitfol.c
    ... oops, I do not want the changed frotz.c in the next commit.
    $ git reset frotz.c
    $ git commit -m 'update nitfol.c for such and such reasons'

This procedure can be used after you have smudged the index in an unwated way, and is not limited to "git add" (or "git add -p"). In this case, you can do:

    $ git checkout HEAD~43 Makefile
    $ git reset Makefile