-$ git reset --soft HEAD^ ;# go back to WIP state <b>(2)</b>\r
-$ git reset <b>(3)</b>\r
-\r
-<b>(1)</b> This commit will get blown away so a throw-away log message is OK.\r
-<b>(2)</b> This removes the 'WIP' commit from the commit history, and makes\r
- your working tree in the state just before you made that snapshot.\r
-<b>(3)</b> After <b>(2)</b>, the index file still has all the WIP changes you\r
- committed in <b>(1)</b>. This sets it to the last commit you were\r
- basing the WIP changes on.</tt></pre>\r