Also check out http://porkrind.org/commit-patch http://porkrind.org/commit-patch (with commit-patch-buffer.el) for an alternative to magit's hunk staging which

Also check out http://porkrind.org/commit-patch http://porkrind.org/commit-patch (with commit-patch-buffer.el) for an alternative to magit's hunk staging which is also works with a bunch of other VCSs (it's heavenly when you're stuck with something old like CVS or SVN).