viernes, 28 de marzo de 2014

git reset. again

Assume you start from a "everything is committed and golden" state. Let's
pretend you came to this starting point via a git checkout: and then you
edit a bunch of stuff, compile/test, and then git add and git
commit:

$ git checkout mywork
...edit edit edit...
$ git add ...
$ git commit

If at this point you do a git reset, here's how the type of reset
("soft", "hard", or the default, which is "mixed") affects things: