A walk through the Magit interface
Don't miss "Staging parts of a hunk", which is Magit's killer feature, IMO.  You can easily go through your current diff (from staged) and add/remove single lines from the staged delta.